updates for cygwin

diff --git a/scilab/config/Makecygdll.incl b/scilab/config/Makecygdll.incl
index a155871..30664f0 100644 (file)
--- a/scilab/config/Makecygdll.incl
+++ b/scilab/config/Makecygdll.incl
@@ -20,11 +20,6 @@ LDFLAGS =  $(EXTRA_LDFLAGS)
 LIBS = -lm \r
 FLIBS=\r
 #******************************************************************* \r
-INCLUDES=  $(XFLAGS) $(TK_INC_PATH) $(TCL_INC_PATH) -I$(SCIDIR)/routines \r
-\r
-# we do not set CFLAGS and FFLAGS here \r
-#CFLAGS = $(CC_OPTIONS) \r
-#FFLAGS = $(FC_OPTIONS) \r
 \r
 QUIET=--quiet\r
 \r
@@ -47,8 +42,10 @@ $(LIBRARY_NAME).dia  : $(LIBRARY_NAME).dll  $(LIBRARY_NAME).tst
        $(SCIDIR)/bin/scilab -nw -e "scitest('$(LIBRARY_NAME).tst');quit;"\r
 \r
 $(LIBRARY_NAME).dll : $(LIBRARY_NAME).def  \r
-       $(CC) --shared -s -o $(LIBRARY_NAME).dll $(LIBRARY_NAME).def \\r
-       $(OBJS) $(SCIDIR)/bin/libsci.a --whole-archive -lg2c  $(WINLIBS)\r
+       @$(ECHO) ------- Building $@  --------\r
+       @$(CC) --shared -s -o $(LIBRARY_NAME).dll $(LIBRARY_NAME).def \\r
+               $(OBJS) $(OTHERLIBS) $(SCIDIR)/bin/libsci.a  -lg2c  $(WINLIBS);\\r
+       dlltool -k --as as --dllname $(LIBRARY_NAME).dll --def $(LIBRARY_NAME).def --output-lib $(LIBRARY_NAME).a ;\r
 \r
 # here we could also use dumpexts XXXX \r
 ECHO=echo\r
@@ -64,27 +61,25 @@ $(LIBRARY_NAME).def : $(OBJS)
        @$(RM) Defs\r
 \r
 \r
-.SUFFIXES: .F .F90 .f90 $(SUFFIXES)\r
+\r
+.SUFFIXES: .F  $(SUFFIXES)\r
 \r
 FCOMPILE = echo "to be done" \r
 \r
 .f.o:\r
        @echo "compiling $< with f2c (g77 pbs with dllimport)"\r
-       @$(SCIDIR)/bin/f2c $(INCLUDES) -A $< ;  \\r
-       $(CC) $(INCLUDES) -I"$(SCIDIR)/routines/f2c" $(CFLAGS) -c $*.c; \\r
-       $(RM) $*.c \r
+       @$(SCIDIR)/bin/f2c -I"$(SCIDIR)/routines/f2c" \\r
+               -I"$(SCIDIR)/routines"  -A $< ; \r
+               $(CC) $(CFLAGS) -I"$(SCIDIR)/routines/f2c" -c $*.c; \\r
+               $(RM) $*.c \r
 \r
 .F.o:\r
-       @echo "compiling $<"\r
-       @$(FCOMPILE)  -c $<\r
-\r
-.F90.o:\r
-       @echo "compiling $<"\r
-       @$(FCOMPILE)  -c $<\r
+       @echo "compiling $< with f2c (g77 pbs with dllimport)"\r
+       @$(SCIDIR)/bin/f2c -I"$(SCIDIR)/routines/f2c" \\r
+               -I"$(SCIDIR)/routines"  -A $< ; \r
+               $(CC) $(CFLAGS) -I"$(SCIDIR)/routines/f2c" -c $*.c; \\r
+               $(RM) $*.c \r
 \r
-.f90.o:\r
-       @echo "compiling $<"\r
-       @$(FCOMPILE)  -c $<\r
 \r
 \r
 \r

diff --git a/scilab/config/Makefile.gcwin32 b/scilab/config/Makefile.gcwin32
index 85a688e..8b901fa 100644 (file)
--- a/scilab/config/Makefile.gcwin32
+++ b/scilab/config/Makefile.gcwin32
@@ -9,24 +9,27 @@ DLL_NAME =libsci
 # scilex-lib
 
 bin/scilex : scilex-lib  routines/wsci/Rscilab.o $(DLL_NAME).dll 
-       gcc -Wl,-subsystem,console -o $@.exe libs/main.o  -L./bin -lsci $(WINLIBS) 
+       gcc -mconsole -o $@.exe libs/main.o  -L./bin -lsci $(WINLIBS) 
 
 # with gcc -mno-cygwin et  f2c 
 # g77 -mno-cygwin -Wl,-subsystem,console --shared 
 #  -mno-cygwin  \
 # -------------------------------------
+#                      -Wl,--whole-archive \
+#                      libs/*.a \
+#                      -Wl,--no-whole-archive -lg2c \
 
 $(DLL_NAME).dll : $(DLL_NAME).def  
-       x=1;if test -f $(DLL_NAME).dll; then  \
+       @x=1;if test -f $(DLL_NAME).dll; then  \
                x=`find $(DEFAULTS) $(LIBR)  \( -name '*.a' -o -name '*.o' \) \
                -newer $(DLL_NAME).dll  -print | wc -l `; \
        fi;\
        if test $$x -ne 0; then \
                $(RM) $@; \
                echo "linking"; \
-               $(CC) -v --shared -s \
-                       -o $(DLL_NAME).dll $(DLL_NAME).def $(DEFAULTS) $(RESOURCES) $(LIBR) \
-                       --whole-archive -Bstatic -lg2c -Bdynamic $(WINLIBS)  ; \
+               $(LD) --shared -s -o $(DLL_NAME).dll $(DLL_NAME).def \
+                       $(DEFAULTS) $(RESOURCES) \
+                       $(LIBR) -lg2c $(WINLIBS)  ; \
        else \
                echo $(DLL_NAME) is up to date ; \
        fi
@@ -37,7 +40,7 @@ SED=sed
 
 $(DLL_NAME).def : $(DEFAULTS) $(RESOURCES) $(LIBR) 
        @$(ECHO) ------- Building $@ --------
-       @$(ECHO) LIBRARY $* > $*.def
+       @$(ECHO) LIBRARY $(DLL_NAME) > $*.def
        @$(ECHO) EXPORTS >> $*.def
        @cat libs/libg2c.def  >> $*.def
        @$(NM) $^ > Defs
@@ -50,11 +53,11 @@ $(DLL_NAME).a : $(DLL_NAME).dll $(DLL_NAME).def
 # XXXXX attention on veut un --whole-archive pour lg2c 
 
 scilex-force : 
-       $(CC)  -Wl,-subsystem,console -o bin/scilex.exe libs/scimain.o \
-       $(RESOURCES) bin/libsci.a $(WINLIBS) --enable-stdcall-fixup
+       $(CC)  -mconsole -o bin/scilex.exe libs/scimain.o \
+       $(RESOURCES) bin/libsci.a $(WINLIBS)  --enable-stdcall-fixup
 
 bin/sci.exe : 
-       $(CC) -Wl,-subsystem,console -o bin/sci.exe  \
+       $(CC) -mconsole -o bin/sci.exe  \
                $(DEFAULTS) $(RESOURCES) $(LIBR) -lg2c $(WINLIBS) 
 
 

diff --git a/scilab/config/config.guess b/scilab/config/config.guess
index dff9e48..d4d8565 100755 (executable)
--- a/scilab/config/config.guess
+++ b/scilab/config/config.guess
@@ -2,8 +2,11 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
+# small patch added to detect if a cygwin should not be considered 
+# as mingw32 (using gcc) Jean-Philippe Chancelier 2002 
+# 
 
-timestamp='2001-09-04'
+timestamp='2002-07-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -737,6 +740,21 @@ EOF
        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        exit 0 ;;
     i*:CYGWIN*:*)
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       int main (argc, argv) int argc; char *argv[]; {
+       #if defined (__MINGW32__)
+         printf ("%s-pc-mingw32\n",argv[1]);
+       #else     
+          printf ("%s-pc-cygwin\n",argv[1]);
+       #endif
+          exit (0);
+       }
+EOF
+       $CC_FOR_BUILD $dummy.c -o $dummy \
+         && ./$dummy "${UNAME_MACHINE}" \
+         && rm -f $dummy.c $dummy.exe && exit 0
+       rm -f $dummy.c $dummy.exe
        echo ${UNAME_MACHINE}-pc-cygwin
        exit 0 ;;
     i*:MINGW*:*)

diff --git a/scilab/examples/Makefile b/scilab/examples/Makefile
index 68d34d3..d15aee9 100755 (executable)
--- a/scilab/examples/Makefile
+++ b/scilab/examples/Makefile
@@ -10,12 +10,17 @@ info        :
        @echo "Type \"make tests\" in examples directory"
        @echo "  to test link and addinter features"
 
-SUBDIRS = interface-tour interface-tour-so \
-       interface-tutorial interface-tutorial-so \
-       interface-lapack intersci-examples intersci-examples-so \
+SUBDIRS1 = interface-tour-so interface-tutorial-so \
+       intersci-examples-so \
+       link-examples-so \
        interface-general \
-       link-examples link-examples-so \
-       misc-examples man-examples macros-examples mex-examples 
+       mex-examples/mex-with-so
+
+SUBDIRS2 = interface-tour interface-tutorial \
+       interface-lapack intersci-examples \
+       link-examples misc-examples man-examples macros-examples mex-examples 
+
+SUBDIRS= $(SUBDIRS1) $(SUBDIRS2)
 
 distclean::
        @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
@@ -33,11 +38,7 @@ clean::
                $(MAKE) $(MFLAGS) clean); \
        done
 
-TEST_SUBDIRS = interface-tour interface-tour-so \
-       interface-tutorial interface-tutorial-so \
-       interface-lapack intersci-examples intersci-examples-so \
-       link-examples link-examples-so \
-       misc-examples man-examples macros-examples mex-examples 
+TEST_SUBDIRS = $(SUBDIRS1) 
 
 tests::
        @case '${MFLAGS}' in *[ik]*) set +e;; esac; \

diff --git a/scilab/examples/interface-general/lib/Makefile b/scilab/examples/interface-general/lib/Makefile
index 10ba89a..0e30ba9 100644 (file)
--- a/scilab/examples/interface-general/lib/Makefile
+++ b/scilab/examples/interface-general/lib/Makefile
@@ -17,7 +17,7 @@ tests : all
 
 clean  ::
        @echo Cleaning 
-       @$(RM) -f -r *.o *.lo *.la *.so *.sl *.a *.dia .job.sce so_locations
+       @$(RM) -f -r *.o *.dll *.lo *.la *.so *.sl *.a *.dia .job.sce so_locations
        @$(RM) -f -r .libs f3cloader.sce f3cmake f3floader.sce f3fmake
 
 distclean:: clean 

diff --git a/scilab/examples/interface-general/lib/builder.sce b/scilab/examples/interface-general/lib/builder.sce
index a95373d..c2eee90 100644 (file)
--- a/scilab/examples/interface-general/lib/builder.sce
+++ b/scilab/examples/interface-general/lib/builder.sce
@@ -9,7 +9,7 @@ link_name = 'util' ;            // functions to be added to the call table
                                // loader.sce (../lib/loader.sce) 
 
 flag  = "c";                   // ext1c is a C function 
-files = ['foo.o bar.o' ];      // objects files for ext1c 
+files = ['foo.o';'bar.o' ];    // objects files for ext1c 
 libs  = [];                    // other libs needed for linking 
 
 // the next call generates files (Makelib,loader.sce) used

diff --git a/scilab/examples/interface-tour-so/Makefile b/scilab/examples/interface-tour-so/Makefile
index f4c13b7..3f6dc7d 100644 (file)
--- a/scilab/examples/interface-tour-so/Makefile
+++ b/scilab/examples/interface-tour-so/Makefile
@@ -2,22 +2,19 @@ SCIDIR=../../
 
 include $(SCIDIR)/Makefile.incl
 
-all    :: Makelib job 
+all    :: Makelib
        make -f Makelib
 
 Makelib : builder.sce
        @echo running builder: BE PATIENT ...
        @$(SCIDIR)/util/scidem $(SCIDIR) builder.sce builder.dia
 
-job    : 
-       make -f Makelib
-
 tests  : all
        make -f Makelib tests 
 
 clean  ::
        @echo Cleaning 
-       @$(RM) -f -r *.o *.lo *.la *.so *.sl *.a *.dia .job.sce so_locations
+       @$(RM) -f -r *.o *.lo *.la *.so *.dll *.sl *.a *.dia .job.sce so_locations
        @$(RM) -f -r .libs f3cloader.sce f3cmake f3floader.sce f3fmake
 
 distclean:: clean 

diff --git a/scilab/examples/interface-tour/Makefile.mak b/scilab/examples/interface-tour/Makefile.mak
index 555778b..ec5b64c 100644 (file)
--- a/scilab/examples/interface-tour/Makefile.mak
+++ b/scilab/examples/interface-tour/Makefile.mak
@@ -39,12 +39,10 @@ OBJSF = $(FORTRANINTERFACES) $(OTHERFOBJS)
 \r
 OBJSC = $(CINTERFACES) $(OTHERCOBJS)\r
 \r
-f3f.obj : \r
-       $(FC) $(FFLAGS) f3f.f\r
 \r
-f3f.dll: f3f.obj\r
+f3f.dll: f3f.obj \r
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**\r
-       @$(LINKER) $(LINKER_FLAGS) f3f.obj $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.ilib" /def:"$*.def" \r
+       $(LINKER) $(LINKER_FLAGS) f3f.obj $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.ilib" /def:"$*.def" \r
 \r
 f3c.obj :\r
        $(CC) $(CFLAGS) f3c.c\r

diff --git a/scilab/examples/interface-tutorial-so/Makefile b/scilab/examples/interface-tutorial-so/Makefile
index 67b70f5..9d4cfaa 100644 (file)
--- a/scilab/examples/interface-tutorial-so/Makefile
+++ b/scilab/examples/interface-tutorial-so/Makefile
@@ -18,7 +18,7 @@ tests : all
 
 clean  ::
        @echo Cleaning 
-       @$(RM) -f -r *.o *.lo *.la *.so *.a *.dia .job.sce so_locations
+       @$(RM) -f -r *.o *.lo *.la *.so *.dll *.a *.dia .job.sce so_locations
        @$(RM) -f -r .libs 
 
 distclean:: clean 

diff --git a/scilab/examples/link-examples-so/ext10c.c b/scilab/examples/link-examples-so/ext10c.c
index 9669828..a7ee116 100644 (file)
--- a/scilab/examples/link-examples-so/ext10c.c
+++ b/scilab/examples/link-examples-so/ext10c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 /*********************************************
  *     external fonction for ode 

diff --git a/scilab/examples/link-examples-so/ext10f.f b/scilab/examples/link-examples-so/ext10f.f
index bc0ad6d..9233aec 100644 (file)
--- a/scilab/examples/link-examples-so/ext10f.f
+++ b/scilab/examples/link-examples-so/ext10f.f
@@ -23,7 +23,7 @@ c     param(1)=y(n+1) , param(2)=y(n+2) etc
 c     with this calling sequence y is a n+np vector
 c     where np=dimension of scilab variable param
 c
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision t, y, ydot, param
       dimension y(3), ydot(3),param(3)
       param(1)=y(n+1)

diff --git a/scilab/examples/link-examples-so/ext11c.c b/scilab/examples/link-examples-so/ext11c.c
index c9a85b6..9e202c1 100644 (file)
--- a/scilab/examples/link-examples-so/ext11c.c
+++ b/scilab/examples/link-examples-so/ext11c.c
@@ -1,6 +1,6 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
-#include "../../routines/stack-c.h"
+#include "stack-c.h"
 
 /****************************************
  *     exemple with a call to ReadMatrix

diff --git a/scilab/examples/link-examples-so/ext11f.f b/scilab/examples/link-examples-so/ext11f.f
index a74b97a..c0fd10a 100644 (file)
--- a/scilab/examples/link-examples-so/ext11f.f
+++ b/scilab/examples/link-examples-so/ext11f.f
@@ -5,7 +5,7 @@ c     -->param=[0.04,10000,3d+7];
 c     -->link('ext11f.o','ext11f')
 c     -->y=ode([1;0;0],0,[0.4,4],'ext11f')
 c     param must be defined as a scilab variable
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision t, y, ydot, param
       logical creadmat
       dimension y(3), ydot(3), param(3)

diff --git a/scilab/examples/link-examples-so/ext12c.c b/scilab/examples/link-examples-so/ext12c.c
index 9ca890f..a2f6bab 100644 (file)
--- a/scilab/examples/link-examples-so/ext12c.c
+++ b/scilab/examples/link-examples-so/ext12c.c
@@ -1,5 +1,5 @@
-/* Copyright INRIA */
-#include "../../routines/stack-c.h"
+/* Copyright Inria/Enpc */
+#include "stack-c.h"
 
 /****************************************
  *     same example with call to GetMatrixptr 

diff --git a/scilab/examples/link-examples-so/ext12f.f b/scilab/examples/link-examples-so/ext12f.f
index ead0ec6..3d1d946 100644 (file)
--- a/scilab/examples/link-examples-so/ext12f.f
+++ b/scilab/examples/link-examples-so/ext12f.f
@@ -6,7 +6,7 @@ c     exemple with a call to cmatptr function
 c     -->param=[0.04,10000,3d+7];
 c     -->link('ext12f.o','ext12f')
 c     -->y=ode([1;0;0],0,[0.4,4],'ext12f')
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision t, y, ydot
       logical cmatptr
       dimension y(3), ydot(3)

diff --git a/scilab/examples/link-examples-so/ext13c.c b/scilab/examples/link-examples-so/ext13c.c
index 7a09c95..904af95 100644 (file)
--- a/scilab/examples/link-examples-so/ext13c.c
+++ b/scilab/examples/link-examples-so/ext13c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 struct {
     float b[10];

diff --git a/scilab/examples/link-examples-so/ext13f.f b/scilab/examples/link-examples-so/ext13f.f
index a7d9b23..59af53e 100644 (file)
--- a/scilab/examples/link-examples-so/ext13f.f
+++ b/scilab/examples/link-examples-so/ext13f.f
@@ -1,5 +1,5 @@
       subroutine ext13if(n,a)
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       common/cmntest/b(10)
       real a(*)
       do 1 k=1,max(n,10)

diff --git a/scilab/examples/link-examples-so/ext14c.c b/scilab/examples/link-examples-so/ext14c.c
index a11f62f..410ff30 100644 (file)
--- a/scilab/examples/link-examples-so/ext14c.c
+++ b/scilab/examples/link-examples-so/ext14c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 /************************************
  *     (very) simple example 1 
@@ -9,7 +9,7 @@
  *     c=a+b 
  ************************************/
 
-#include "../../routines/stack-c.h"
+#include "stack-c.h"
 
 int ext14cI(fname)
      char* fname;

diff --git a/scilab/examples/link-examples-so/ext14f.f b/scilab/examples/link-examples-so/ext14f.f
index e9f7ac8..1794585 100644 (file)
--- a/scilab/examples/link-examples-so/ext14f.f
+++ b/scilab/examples/link-examples-so/ext14f.f
@@ -1,5 +1,5 @@
 
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       subroutine ext14fi(fname)
       character*(*) fname
       logical getrhsvar, createvar,  putlhsvar

diff --git a/scilab/examples/link-examples-so/ext1c.c b/scilab/examples/link-examples-so/ext1c.c
index 7b83bb8..c22fd60 100644 (file)
--- a/scilab/examples/link-examples-so/ext1c.c
+++ b/scilab/examples/link-examples-so/ext1c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 /************************************
  *     (very) simple example 1 

diff --git a/scilab/examples/link-examples-so/ext1f.f b/scilab/examples/link-examples-so/ext1f.f
index 1eef557..9e14d8f 100644 (file)
--- a/scilab/examples/link-examples-so/ext1f.f
+++ b/scilab/examples/link-examples-so/ext1f.f
@@ -4,7 +4,7 @@ c     -->link('ext1f.o','ext1f');
 c     -->a=[1,2,3];b=[4,5,6];n=3;
 c     -->c=call('ext1f',n,1,'i',a,2,'d',b,3,'d','out',[1,3],4,'d')
 c     c=a+b
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(*),b(*),c(*)
       do 1 k=1,n
          c(k)=a(k)+b(k)

diff --git a/scilab/examples/link-examples-so/ext2c.c b/scilab/examples/link-examples-so/ext2c.c
index aab4a82..2c3582f 100644 (file)
--- a/scilab/examples/link-examples-so/ext2c.c
+++ b/scilab/examples/link-examples-so/ext2c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 /************************************
  *     simple example 2 (using sin and cos) 

diff --git a/scilab/examples/link-examples-so/ext2f.f b/scilab/examples/link-examples-so/ext2f.f
index 54e2214..0a8b6ad 100644 (file)
--- a/scilab/examples/link-examples-so/ext2f.f
+++ b/scilab/examples/link-examples-so/ext2f.f
@@ -4,7 +4,7 @@ c     -->link('ext2f.o','ext2f');
 c     -->a=[1,2,3];b=[4,5,6];n=3;
 c     -->c=call('ext2f',n,1,'i',a,2,'d',b,3,'d','out',[1,3],4,'d')
 c     -->c=sin(a)+cos(b)
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(*),b(*),c(*)
       do 1 k=1,n
          c(k)=sin(a(k))+cos(b(k))

diff --git a/scilab/examples/link-examples-so/ext3c.c b/scilab/examples/link-examples-so/ext3c.c
index f14e9d8..bdc8771 100644 (file)
--- a/scilab/examples/link-examples-so/ext3c.c
+++ b/scilab/examples/link-examples-so/ext3c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 
 /************************************

diff --git a/scilab/examples/link-examples-so/ext3f.f b/scilab/examples/link-examples-so/ext3f.f
index c2c4188..484ad9b 100644 (file)
--- a/scilab/examples/link-examples-so/ext3f.f
+++ b/scilab/examples/link-examples-so/ext3f.f
@@ -6,7 +6,7 @@ c     -->a=[1,2,3];b=[4,5,6];n=3;
 c     -->c=call('ext3f','yes',1,'c',n,2,'i',a,3,'d',b,4,'d','out',[1,3],5,'d')
 c     -->c=sin(a)+cos(b)
 c     -------------------------------------
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(*),b(*),c(*)
       character*(*) ch
       if(ch(1:3).eq.'yes') then

diff --git a/scilab/examples/link-examples-so/ext4c.c b/scilab/examples/link-examples-so/ext4c.c
index db77437..533e469 100644 (file)
--- a/scilab/examples/link-examples-so/ext4c.c
+++ b/scilab/examples/link-examples-so/ext4c.c
@@ -1,6 +1,6 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 #include <math.h>
-#include "../../routines/stack-c.h"
+#include "stack-c.h"
 
 /************************************
  *     simple example 4 (reading a scilab chain) 

diff --git a/scilab/examples/link-examples-so/ext4f.f b/scilab/examples/link-examples-so/ext4f.f
index e840053..4be7467 100644 (file)
--- a/scilab/examples/link-examples-so/ext4f.f
+++ b/scilab/examples/link-examples-so/ext4f.f
@@ -7,7 +7,7 @@ c     -->c=sin(a)+cos(b)
 c     -->yes='no'
 c     -->c=a+b
 c     -->clear yes  --> undefined variable : yes
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(*),b(*),c(*)
       integer chmax
       logical creadchain

diff --git a/scilab/examples/link-examples-so/ext5c.c b/scilab/examples/link-examples-so/ext5c.c
index ca7cc35..ffb9663 100644 (file)
--- a/scilab/examples/link-examples-so/ext5c.c
+++ b/scilab/examples/link-examples-so/ext5c.c
@@ -1,5 +1,5 @@
-/* Copyright INRIA */
-#include "../../routines/stack-c.h"
+/* Copyright Inria/Enpc */
+#include "stack-c.h"
 
 /******************************************
  *     Example 5 

diff --git a/scilab/examples/link-examples-so/ext5f.f b/scilab/examples/link-examples-so/ext5f.f
index 214ef59..9042423 100644 (file)
--- a/scilab/examples/link-examples-so/ext5f.f
+++ b/scilab/examples/link-examples-so/ext5f.f
@@ -6,7 +6,7 @@ c     -->link('ext5f.o','ext5f')
 c     -->a=[1,2,3];b=[2,3,4];
 c     -->c=call('ext5f',b,1,'d','out',[1,3],2,'d')
 c     -->c=a+2*b
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(3),b(*),c(*)
       logical creadmat
 

diff --git a/scilab/examples/link-examples-so/ext6c.c b/scilab/examples/link-examples-so/ext6c.c
index 8844d88..2dbda9f 100644 (file)
--- a/scilab/examples/link-examples-so/ext6c.c
+++ b/scilab/examples/link-examples-so/ext6c.c
@@ -1,5 +1,5 @@
-/* Copyright INRIA */
-#include "../../routines/stack-c.h"
+/* Copyright Inria/Enpc */
+#include "stack-c.h"
 
 /******************************************
  *   example 6 

diff --git a/scilab/examples/link-examples-so/ext6f.f b/scilab/examples/link-examples-so/ext6f.f
index 9c139c8..aff7bf5 100644 (file)
--- a/scilab/examples/link-examples-so/ext6f.f
+++ b/scilab/examples/link-examples-so/ext6f.f
@@ -5,7 +5,7 @@ c     -->link('ext6f.o','ext6f')
 c     -->a=[1,2,3];b=[2,3,4];
 c     -->c=call('ext6f','a',1,'c',b,2,'d','out',[1,3],3,'d')
 c     -->c=a+2*b
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(3),b(*),c(*)
       logical creadmat
       character*(*) aname

diff --git a/scilab/examples/link-examples-so/ext7c.c b/scilab/examples/link-examples-so/ext7c.c
index 53e3ccc..d7ae103 100644 (file)
--- a/scilab/examples/link-examples-so/ext7c.c
+++ b/scilab/examples/link-examples-so/ext7c.c
@@ -1,5 +1,5 @@
-/* Copyright INRIA */
-#include "../../routines/stack-c.h"
+/* Copyright Inria/Enpc */
+#include "stack-c.h"
 
 /******************************************
  *     example 7 

diff --git a/scilab/examples/link-examples-so/ext7f.f b/scilab/examples/link-examples-so/ext7f.f
index 7de4a91..d1bfd9c 100644 (file)
--- a/scilab/examples/link-examples-so/ext7f.f
+++ b/scilab/examples/link-examples-so/ext7f.f
@@ -7,7 +7,7 @@ c     c does not exist (c made by the call to matz)
 c     -->call('ext7f',a,1,'d',b,2,'d','out',1);
 c     c now exists
 c     -->c=a+2*b
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision a(3),b(3),c(3),w
       logical cwritemat,cwritechain
       do 1 k=1,3

diff --git a/scilab/examples/link-examples-so/ext8c.c b/scilab/examples/link-examples-so/ext8c.c
index 72e6a3e..23549f6 100644 (file)
--- a/scilab/examples/link-examples-so/ext8c.c
+++ b/scilab/examples/link-examples-so/ext8c.c
@@ -1,5 +1,5 @@
-/* Copyright INRIA */
-#include "../../routines/stack-c.h"
+/* Copyright Inria/Enpc */
+#include "stack-c.h"
 
 /****************************************
  *     an example with  GetMatrixptr 

diff --git a/scilab/examples/link-examples-so/ext8f.f b/scilab/examples/link-examples-so/ext8f.f
index 8e5095b..3771a29 100644 (file)
--- a/scilab/examples/link-examples-so/ext8f.f
+++ b/scilab/examples/link-examples-so/ext8f.f
@@ -4,7 +4,7 @@ c     same example with call to cmatptr
 c     -->param=[1,2,3];         
 c     -->link('ext8c.o','ext8c','C');     
 c     -->y=call('ext8c','out',size(param),1,'d');
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       logical cmatptr
       double precision y(*)
       include '../../routines/stack.h'

diff --git a/scilab/examples/link-examples-so/ext9c.c b/scilab/examples/link-examples-so/ext9c.c
index e7a8fbd..03f9225 100644 (file)
--- a/scilab/examples/link-examples-so/ext9c.c
+++ b/scilab/examples/link-examples-so/ext9c.c
@@ -1,4 +1,4 @@
-/* Copyright INRIA */
+/* Copyright Inria/Enpc */
 
 /*********************************************
  *     argument function for ode 

diff --git a/scilab/examples/link-examples-so/ext9f.f b/scilab/examples/link-examples-so/ext9f.f
index 7fc0496..ea4ad08 100644 (file)
--- a/scilab/examples/link-examples-so/ext9f.f
+++ b/scilab/examples/link-examples-so/ext9f.f
@@ -20,7 +20,7 @@ c     With dynamic link:
 c     -->link('ext9f.o','ext9f')
 c     -->ode([1;0;0],0,[0.4,4],'ext9f')
 c
-c     Copyright INRIA
+c     Copyright Inria/Enpc
       double precision t, y, ydot
       dimension y(3), ydot(3)
       ydot(1) = -.0400d+0*y(1) + 1.0d+4*y(2)*y(3)

diff --git a/scilab/routines/wsci/Makefile b/scilab/routines/wsci/Makefile
index df5b197..ec846f4 100644 (file)
--- a/scilab/routines/wsci/Makefile
+++ b/scilab/routines/wsci/Makefile
@@ -16,7 +16,7 @@ OBJSF =
 
 include ../../Makefile.incl
 
-CFLAGS = $(CC_OPTIONS) -I../ -Wall
+CFLAGS = $(CC_OPTIONS)
 FFLAGS = $(FC_OPTIONS)
 
 include ../Make.lib
@@ -37,17 +37,17 @@ all :: ../../libs/scimain.o
 ../../libs/scimain.o   : 
        $(CC) $(CFLAGS) -o ../../libs/scimain.o -c scimain.c 
 
+distclean::
+       @$(RM) ../../libs/scimain.o 
+
 #================= resources 
 
 RESOURCES= Rscilab.o
 
 all    :: $(RESOURCES) 
 
-Rscilab.o      : Rscilab.res 
-       $(CVTRES) Rscilab.res Rscilab.o
-
-Rscilab.res: Rscilab.rc wresource.h
-       $(RC) $(RCVARS) /foRscilab.res Rscilab.rc
+Rscilab.o      : Rscilab.rc wresource.h 
+       $(RC) Rscilab.rc $(RCVARS) -o Rscilab.o 
 
 #===================test ========================
 
@@ -64,34 +64,29 @@ wtest.o : wtloop.c
 all:: ../../bin/lpr.exe
 
 ../../bin/lpr.exe : lpr.o 
-       $(CC) $(CFLAGS) -DGVW_ALONE $(LINKEROPT)  -o $@ \
-       lpr.o  $(WIN32LIBS)
+       $(CC) $(CFLAGS) -DGVW_ALONE $(LINKEROPT)  -o $@ $^  $(WIN32LIBS)
 
 lpr.o : gvwprn.c 
 
-#=================== runscilab========================
-
-RUNOBJSC = runscilab.o
-RUNRESOURCES= Rrunscilab.o
+distclean::
+       @$(RM) ../../bin/lpr.exe 
 
-RUNLINKEROPT=-Wl,-subsystem,windows,-S
+#=================== runscilab========================
 
 all    :: ../../bin/runscilab.exe
 
-../../bin/runscilab.exe        : $(RUNOBJSC) $(RUNRESOURCES)
-       $(CC) $(CFLAGS) $(RUNLINKEROPT) -o ../../bin/runscilab.exe $(RUNOBJSC) \
-       $(RUNRESOURCES) $(WIN32LIBS)
+../../bin/runscilab.exe: runscilab.o Rrunscilab.o
+       $(CC) $(CFLAGS) -o $@ $^ $(WIN32LIBS)
 
-all    :: $(RUNRESOURCES) 
+Rrunscilab.o: Rrunscilab.rc wresource.h 
+       $(RC) Rrunscilab.rc $(RCVARS) -o Rrunscilab.o 
 
-Rrunscilab.o   : Rrunscilab.res 
-       $(CVTRES) Rrunscilab.res Rrunscilab.o
+distclean::
+       @$(RM) ../../bin/runscilab.exe 
 
-Rrunscilab.res: Rrunscilab.rc 
-       $(RC) $(RCVARS) /foRrunscilab.res Rrunscilab.rc
+#=================== general ========================
 
 clean  ::
-       $(RM) $(RUNOBJSC) $(RUNRESOURCES) Rsunscilab.res
+       @$(RM) *.o 
 
-distclean::
-       $(RM) $(RUNOBJSC) $(RUNRESOURCES) Rsunscilab.res
+distclean :: clean 

diff --git a/scilab/routines/wsci/jpc_Xloop.c b/scilab/routines/wsci/jpc_Xloop.c
index 4f761b9..1d0deea 100644 (file)
--- a/scilab/routines/wsci/jpc_Xloop.c
+++ b/scilab/routines/wsci/jpc_Xloop.c
@@ -1,6 +1,6 @@
 
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 /*
  * jpc_Xloop.c : 
  * (1997) : Jean-Philippe Chancelier 

diff --git a/scilab/routines/wsci/lpr.c b/scilab/routines/wsci/lpr.c
index 377c116..534cbd5 100644 (file)
--- a/scilab/routines/wsci/lpr.c
+++ b/scilab/routines/wsci/lpr.c
@@ -1,6 +1,6 @@
 
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
 #ifndef GVW_ALONE
 #define GVW_ALONE

diff --git a/scilab/routines/wsci/rdl-nw-test.c b/scilab/routines/wsci/rdl-nw-test.c
index 1eafca6..9cab5a7 100644 (file)
--- a/scilab/routines/wsci/rdl-nw-test.c
+++ b/scilab/routines/wsci/rdl-nw-test.c
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/scilab/routines/wsci/readcons.c b/scilab/routines/wsci/readcons.c
index 41762b5..62e5722 100644 (file)
--- a/scilab/routines/wsci/readcons.c
+++ b/scilab/routines/wsci/readcons.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
 /**************************************
  * performs I/O in a console window 

diff --git a/scilab/routines/wsci/readline.c b/scilab/routines/wsci/readline.c
index 925e079..c31ca1f 100644 (file)
--- a/scilab/routines/wsci/readline.c
+++ b/scilab/routines/wsci/readline.c
@@ -57,6 +57,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
+#include <conio.h>
 
 #ifdef __CYGWIN32__
 #include <unistd.h>            /* for isatty */

diff --git a/scilab/routines/wsci/readwin.c b/scilab/routines/wsci/readwin.c
index b0d1b4d..afd8c04 100644 (file)
--- a/scilab/routines/wsci/readwin.c
+++ b/scilab/routines/wsci/readwin.c
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
 /**************************************
  * performs I/O in a windows window 

diff --git a/scilab/routines/wsci/runscilab.c b/scilab/routines/wsci/runscilab.c
index 0c0288d..f08bd05 100644 (file)
--- a/scilab/routines/wsci/runscilab.c
+++ b/scilab/routines/wsci/runscilab.c
@@ -1,7 +1,7 @@
 
 
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
 /*
    Simple program to start Scilab with its console window hidden.

diff --git a/scilab/routines/wsci/sh.c b/scilab/routines/wsci/sh.c
index 7f6e896..b4b7b21 100644 (file)
--- a/scilab/routines/wsci/sh.c
+++ b/scilab/routines/wsci/sh.c
@@ -1,9 +1,9 @@
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
-
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
 #include <stdio.h>
 #include <windows.h>
 #include <string.h>
+#include "common.h" 
 
 HANDLE hChildStdinRd, hChildStdinWr, hChildStdinWrDup, hChildStdoutRd,
   hChildStdoutWr, hInputFile, hSaveStdin, hSaveStdout;

diff --git a/scilab/routines/wsci/wcommon.h b/scilab/routines/wsci/wcommon.h
index 168f00a..fd8e2a4 100644 (file)
--- a/scilab/routines/wsci/wcommon.h
+++ b/scilab/routines/wsci/wcommon.h
@@ -31,6 +31,8 @@
 #include "../graphics/periWin-bcg.h" /* Scilab graphic window */
 #include "wadd.h" 
 
+#include "common.h" 
+
 /* wgnuplib.c */
 
 extern HINSTANCE hdllInstance;
@@ -41,20 +43,22 @@ extern LPSTR szGraphClass;
 extern LPSTR szParentGraphClass;
 extern LPSTR szAboutClass;
 
-void * LocalAllocPtr(UINT flags, UINT size);
-void LocalFreePtr(void  *ptr);
-LPSTR GetInt(LPSTR str, LPINT pval);
-LPSTR GetLInt(LPSTR str, long int *pval);
+extern void * LocalAllocPtr(UINT flags, UINT size);
+extern void LocalFreePtr(void  *ptr);
+extern LPSTR GetInt(LPSTR str, LPINT pval);
+extern LPSTR GetLInt(LPSTR str, long int *pval);
 
 /* wtext.c */
 
-int CtrlCHit(LPTW lptw);
-void UpdateText(LPTW, int);
-void NewLine(LPTW);
-void TextPutStr(LPTW lptw, LPSTR str);
-void WriteTextIni(LPTW lptw);
-void ReadTextIni(LPTW lptw);
-void DragFunc(LPTW lptw, HDROP hdrop);
+extern void TextSelectFont (LPTW lptw);
+extern void TextCopyClip (LPTW lptw);
+extern int CtrlCHit(LPTW lptw);
+extern void UpdateText(LPTW, int);
+extern void NewLine(LPTW);
+extern void TextPutStr(LPTW lptw, LPSTR str);
+extern void WriteTextIni(LPTW lptw);
+extern void ReadTextIni(LPTW lptw);
+extern void DragFunc(LPTW lptw, HDROP hdrop);
 extern int C2F(sxevents)();
 
 /* wmenu.c - Menu */
@@ -68,25 +72,25 @@ typedef struct tagGFILE {
        int     getleft;
 } GFILE;
 
-void SendMacro(LPTW lptw, UINT m);
-void LoadMacros(LPTW lptw);
-void CloseMacros(LPTW lptw);
-void MenuFixCurrentWin(int ivalue);
-BOOL SciOpenSave(HWND hWndParent,  BYTE **s,  char **d,int *ierr);
-int GetLine(char * buffer, int len, GFILE *gfile);
-void LeftJustify(char *d, char *s);
+extern void SendMacro(LPTW lptw, UINT m);
+extern void LoadMacros(LPTW lptw);
+extern void CloseMacros(LPTW lptw);
+extern void MenuFixCurrentWin(int ivalue);
+extern BOOL SciOpenSave(HWND hWndParent,  BYTE **s,  char **d,int *ierr);
+extern int GetLine(char * buffer, int len, GFILE *gfile);
+extern void LeftJustify(char *d, char *s);
 extern GFILE * Gfopen(LPSTR lpszFileName, int fnOpenMode);
 extern void Gfclose(GFILE * gfile);
 extern int Gfgets(LPSTR lp, int size, GFILE *gfile);
 
 /* wprinter.c - Printer setup and dump */
 
-BOOL PrintSize(HDC printer, HWND hwnd, LPRECT lprect);
-void PrintRegister(LPPRINT lpr);
-void PrintUnregister(LPPRINT lpr);
+extern BOOL PrintSize(HDC printer, HWND hwnd, LPRECT lprect);
+extern void PrintRegister(LPPRINT lpr);
+extern void PrintUnregister(LPPRINT lpr);
 
-EXPORT BOOL CALLBACK  PrintAbortProc(HDC hdcPrn, int code);
-EXPORT BOOL CALLBACK  PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+extern EXPORT BOOL CALLBACK  PrintAbortProc(HDC hdcPrn, int code);
+extern EXPORT BOOL CALLBACK  PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 /* wstatbar.c */
 
@@ -109,12 +113,12 @@ extern int sciprint2(int v,char *fmt,...);
 
 extern int Pause(LPSTR mess); 
 extern void WinExit(void);
-EXPORT int CALLBACK ShutDown(void);
+extern EXPORT int CALLBACK ShutDown(void);
 extern void Scistring(char *str);
 extern int C2F(clearexit)(integer *n);
 extern int ReadKey(void);
-int WriteStr(char *s, FILE *file);
-int WriteKey(char c, FILE *file);
+extern int WriteStr(char *s, FILE *file);
+extern int WriteKey(char c, FILE *file);
 
 /* ../menusX */
 
@@ -132,12 +136,12 @@ extern int TestMessage();
 /* readline-nowin */
 
 extern void add_history_nw();
-char *readline_nw(char *prompt);
+extern char *readline_nw(char *prompt);
 
 /* readline */
 
 extern void add_history_win();
-char *readline_win(char *prompt);
+extern char *readline_win(char *prompt);
 
 /* wgmenu */
 
@@ -156,7 +160,7 @@ extern int C2F(delbtn)(integer *,char *);
 extern int C2F(addmen)(integer *,char *,integer *,integer *,integer *,
                       integer *,
                       char *,  integer *);
-void AddMenu(integer *win_num,char * button_name,char ** entries,
+extern void AddMenu(integer *win_num,char * button_name,char ** entries,
             integer * ne,integer *typ,char * fname, integer * ierr);
 
 /* gvwprn.c */
@@ -187,12 +191,12 @@ extern int instring(char *str,char  c);
 /* wtloop */
 
 extern void sci_windows_main(int,int *,char *,int,int *,int);
-void SciMenuSelect(char *Name);
-void test_sci();
-void test_mouse();
-void  C2F(setfbutn)(char *buf,int *rep);
-void  C2F(fbutn)(char *buf,int *win,int *ent);
-void  SignalCtrC(void);
+extern void SciMenuSelect(char *Name);
+extern void test_sci();
+extern void test_mouse();
+extern void  C2F(setfbutn)(char *buf,int *rep);
+extern void  C2F(fbutn)(char *buf,int *win,int *ent);
+extern void  SignalCtrC(void);
 
 /* wgnuplib */
 
@@ -200,11 +204,10 @@ void  SignalCtrC(void);
 extern void  NoDll(HINSTANCE hInstance);
 #endif
 
-
 /** wgraph */
 extern void DebugGW (char *fmt, ...);
-EXPORT void WINAPI  GraphPrint(struct BCG *ScilabGC);
-EXPORT void WINAPI  GraphRedraw(struct BCG *ScilabGC);
+extern EXPORT void WINAPI  GraphPrint(struct BCG *ScilabGC);
+extern EXPORT void WINAPI  GraphRedraw(struct BCG *ScilabGC);
 extern int C2F(deletewin)(integer *number) ;
 extern void NewCopyClip(struct BCG *ScilabGC);
 extern void CopyClip(struct BCG *ScilabGC);
@@ -227,11 +230,11 @@ extern void DoHelpDialog();
 
 /* wmprint */
 
-int ScilabPsToEps(char orientation,char *filenamein,char *filenameout);
+extern int ScilabPsToEps(char orientation,char *filenamein,char *filenameout);
 
 /* wmtex.c */
 
-int ScilabPsToTeX(char orientation,char *filenamein,char *filenameout,double xs,double ys);
+extern int ScilabPsToTeX(char orientation,char *filenamein,char *filenameout,double xs,double ys);
 
 /* elsewhere in scilab : in Fortran code maybe */
 

diff --git a/scilab/routines/wsci/wgmenu.c b/scilab/routines/wsci/wgmenu.c
index 9d89b54..6c8f0d8 100644 (file)
--- a/scilab/routines/wsci/wgmenu.c
+++ b/scilab/routines/wsci/wgmenu.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 /* Scilab wgmenu.c 
 
  *  Menus for graphic window ( from wmenu.c ) 

diff --git a/scilab/routines/wsci/wgraph.c b/scilab/routines/wsci/wgraph.c
index 801c2cb..9c68a4c 100644 (file)
--- a/scilab/routines/wsci/wgraph.c
+++ b/scilab/routines/wsci/wgraph.c
@@ -62,8 +62,7 @@ static int scig_buzy = 0;
 
 /* add handlers for delete action */
 
-void scig_deletegwin_handler_none (win)
-     int win;
+void scig_deletegwin_handler_none (int win)
 {
 };
 
@@ -611,8 +610,7 @@ But;
 static But ClickBuf[MaxCB];
 static int lastc = 0;
 
-int scig_click_handler_none (win, x, y, ibut, motion, release)
-     int win, x, y, ibut, motion, release;
+int scig_click_handler_none (int win,int x,int y,int ibut,int motion,int release)
 {
   return 0;
 };
@@ -1008,7 +1006,7 @@ EXPORT LRESULT CALLBACK
            break;
          case SB_PAGEDOWN:
            deltax = horzsi.nPos;
-           horzsi.nPos = min (horzsi.nMax - horzsi.nPage, horzsi.nPos + 50);
+           horzsi.nPos = min (horzsi.nMax - (int)horzsi.nPage, horzsi.nPos + 50);
            deltax = deltax - horzsi.nPos;
            break;
          case SB_LINEUP:
@@ -1018,7 +1016,7 @@ EXPORT LRESULT CALLBACK
            break;
          case SB_LINEDOWN:
            deltax = horzsi.nPos;
-           horzsi.nPos = min (horzsi.nMax - horzsi.nPage, horzsi.nPos + 5);
+           horzsi.nPos = min (horzsi.nMax - (int) horzsi.nPage, horzsi.nPos + 5);
            deltax = deltax - horzsi.nPos;
            break;
          case SB_THUMBTRACK:
@@ -1049,7 +1047,7 @@ EXPORT LRESULT CALLBACK
            break;
          case SB_PAGEDOWN:
            deltay = vertsi.nPos;
-           vertsi.nPos = min (vertsi.nMax - vertsi.nPage, vertsi.nPos + 50);
+           vertsi.nPos = min (vertsi.nMax - (int) vertsi.nPage, vertsi.nPos + 50);
            deltay = deltay - vertsi.nPos;
            break;
          case SB_LINEUP:
@@ -1059,7 +1057,7 @@ EXPORT LRESULT CALLBACK
            break;
          case SB_LINEDOWN:
            deltay = vertsi.nPos;
-           vertsi.nPos = min (vertsi.nMax - vertsi.nPage, vertsi.nPos + 5);
+           vertsi.nPos = min (vertsi.nMax - (int) vertsi.nPage, vertsi.nPos + 5);
            deltay = deltay - vertsi.nPos;
            break;
          case SB_THUMBTRACK:

diff --git a/scilab/routines/wsci/winmain.c b/scilab/routines/wsci/winmain.c
index 5ae3d2e..1b1cf07 100644 (file)
--- a/scilab/routines/wsci/winmain.c
+++ b/scilab/routines/wsci/winmain.c
@@ -32,12 +32,6 @@
 #include <windowsx.h>
 #include <commctrl.h>
 
-#ifdef __STDC__
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
-
 #if (defined __MSC__ ) || (defined __MINGW32__) 
 #define putenv(x) _putenv(x)
 #endif
@@ -84,6 +78,7 @@ extern void C2F (diary) (char *, int *, int);
 static void AllGraphWinDelete ();
 static int startupf = 0; /** 0 if we execute startup else 1 **/
 static int nointeractive = 0;
+static int show_logo = 1;
 
 #define MIN_STACKSIZE 180000
 
@@ -513,6 +508,14 @@ InteractiveMode ()
   return nointeractive;
 }
 
+int 
+C2F(showlogo) ()
+{
+  return show_logo;
+}
+
+
+
 int
 MyPutCh (int ch)
 {

diff --git a/scilab/routines/wsci/wmhelp.c b/scilab/routines/wsci/wmhelp.c
index d69c50a..274d85d 100755 (executable)
--- a/scilab/routines/wsci/wmhelp.c
+++ b/scilab/routines/wsci/wmhelp.c
@@ -1,6 +1,6 @@
 
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 /************************************************************************
  * wmhelp 
  * help menu for scilab 

diff --git a/scilab/routines/wsci/wmprint.c b/scilab/routines/wsci/wmprint.c
index 1ff17c9..921cfce 100644 (file)
--- a/scilab/routines/wsci/wmprint.c
+++ b/scilab/routines/wsci/wmprint.c
@@ -1,6 +1,6 @@
 
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/scilab/routines/wsci/wmtex.c b/scilab/routines/wsci/wmtex.c
index 026f313..3d12502 100644 (file)
--- a/scilab/routines/wsci/wmtex.c
+++ b/scilab/routines/wsci/wmtex.c
@@ -1,14 +1,13 @@
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#ifndef __STDC__
-#include <malloc.h>
-#endif
 #include <stdio.h>
-
 #include "../machine.h"
 
+#include "common.h" 
+
+
 static int Sed __PARAMS ((int, char *, FILE *, char *, char *, char *, char *, char *, char *));
 static void readOneLine __PARAMS ((char *buff, int *stop, FILE * fd));
 static void FileNameChange __PARAMS ((char *filein, char *fileout, char *, char *));

diff --git a/scilab/routines/wsci/wstatbar.c b/scilab/routines/wsci/wstatbar.c
index 226d627..d34ed60 100644 (file)
--- a/scilab/routines/wsci/wstatbar.c
+++ b/scilab/routines/wsci/wstatbar.c
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 /*********************************************
  *   STATBAR.C -- Status bar helper functions.
  *              (c) Paul Yao, 1996

diff --git a/scilab/routines/wsci/wtest.c b/scilab/routines/wsci/wtest.c
index e1c22dd..2b5dcb3 100644 (file)
--- a/scilab/routines/wsci/wtest.c
+++ b/scilab/routines/wsci/wtest.c
@@ -1,7 +1,7 @@
 
 
 
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 
 
 #ifndef TEST

diff --git a/scilab/routines/wsci/wtloop.c b/scilab/routines/wsci/wtloop.c
index e652c92..0a60987 100644 (file)
--- a/scilab/routines/wsci/wtloop.c
+++ b/scilab/routines/wsci/wtloop.c
@@ -45,6 +45,8 @@
 #include "wresource.h"
 #include "wcommon.h"
 #include "../sun/h_help.h"
+#include "../sun/Sun.h"
+#include "../stack-c.h" 
 
 extern char input_line[];
 

diff --git a/scilab/routines/wsci/x_zzledt.c b/scilab/routines/wsci/x_zzledt.c
index 5d5162f..00af839 100644 (file)
--- a/scilab/routines/wsci/x_zzledt.c
+++ b/scilab/routines/wsci/x_zzledt.c
@@ -1,5 +1,4 @@
-
-/* Copyright (C) 1998 Chancelier Jean-Philippe */
+/* Copyright (C) 1998-2002 Chancelier Jean-Philippe */
 /************************************
  * reading functions for scilab 
  * Scilab 1997
@@ -82,5 +81,5 @@ void C2F (setprlev) (pause)
   else if (*pause > 0)
     sprintf (save_prompt, "-%d->", *pause);
   else
-    sprintf (save_prompt, ">>", *pause);
+    sprintf (save_prompt, ">>");
 }