Remove many "extern" and update callinterf.h with includes/gw_XXX.h
Allan Cornet [Sat, 31 Mar 2007 21:15:32 +0000 (21:15 +0000)]
150 files changed:
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/arnoldi/includes/gw_arnoldi.h [new file with mode: 0644]
scilab/modules/arnoldi/sci_gateway/c/gw_arnoldi.c
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/includes/gw_boolean.h
scilab/modules/boolean/sci_gateway/c/gw_boolean.c
scilab/modules/boolean/sci_gateway/c/sci_bool2s.c [new file with mode: 0644]
scilab/modules/boolean/sci_gateway/c/sci_find.c [new file with mode: 0644]
scilab/modules/boolean/src/c/boolean.vcproj
scilab/modules/cacsd/includes/gw_cacsd0.h
scilab/modules/cacsd/includes/gw_cacsd1.h
scilab/modules/cacsd/includes/gw_cacsd2.h
scilab/modules/cacsd/includes/gw_cacsd3.h
scilab/modules/cacsd/includes/gw_slicot.h [new file with mode: 0644]
scilab/modules/cacsd/sci_gateway/c/gw_cacsd0.c
scilab/modules/cacsd/sci_gateway/c/gw_cacsd1.c
scilab/modules/cacsd/sci_gateway/c/gw_cacsd2.c
scilab/modules/cacsd/sci_gateway/c/gw_cacsd3.c
scilab/modules/cacsd/sci_gateway/c/gw_slicot.c
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
scilab/modules/core/Makefile.am
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/gw_user.h [moved from scilab/modules/core/src/c/matusr.h with 57% similarity]
scilab/modules/core/includes/gw_user2.h [moved from scilab/modules/core/src/c/matus2.h with 50% similarity]
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/sci_gateway/c/gw_user.c [moved from scilab/modules/core/src/c/matusr.c with 95% similarity]
scilab/modules/core/sci_gateway/c/gw_user2.c [moved from scilab/modules/core/src/c/matus2.c with 82% similarity]
scilab/modules/core/sci_gateway/c/sci_getdynlibext.c
scilab/modules/core/sci_gateway/c/sci_gethistory.c
scilab/modules/core/sci_gateway/c/sci_resethistory.c
scilab/modules/core/sci_gateway/c/sci_savehistory.c
scilab/modules/core/sci_gateway/c/sci_who.c
scilab/modules/core/sci_gateway/c/sci_with_module.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/callinterf.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/mexlib.c
scilab/modules/core/src/c/parse.c
scilab/modules/core/src/c/parse.h
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/includes/gw_data_structures1.h
scilab/modules/data_structures/includes/gw_data_structures2.h
scilab/modules/data_structures/sci_gateway/c/gw_data_structures1.c
scilab/modules/data_structures/sci_gateway/c/gw_data_structures2.c
scilab/modules/data_structures/sci_gateway/c/sci_getfield.c [new file with mode: 0644]
scilab/modules/data_structures/sci_gateway/c/sci_setfield.c [new file with mode: 0644]
scilab/modules/data_structures/src/c/data_structures.vcproj
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/includes/gw_differential_equations1.h
scilab/modules/differential_equations/includes/gw_differential_equations2.h
scilab/modules/differential_equations/includes/gw_differential_equations3.h
scilab/modules/differential_equations/includes/gw_differential_equations4.h
scilab/modules/differential_equations/includes/gw_differential_equations5.h
scilab/modules/differential_equations/includes/gw_differential_equations6.h
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations1.c
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations2.c
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations3.c
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations4.c
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations5.c
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations6.c
scilab/modules/differential_equations/sci_gateway/c/sci_odc.c [new file with mode: 0644]
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/elementaries_functions/includes/gw_elementaries_functions.h
scilab/modules/elementaries_functions/sci_gateway/c/gw_elementaries_functions.c
scilab/modules/fftw/includes/gw_fftw.h
scilab/modules/fftw/sci_gateway/c/gw_fftw.c
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_champ.c
scilab/modules/graphics/sci_gateway/c/sci_fec.c
scilab/modules/graphics/sci_gateway/c/sci_geom3d.c
scilab/modules/graphics/sci_gateway/c/sci_grayplot.c
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/sci_gateway/c/sci_param3d.c
scilab/modules/graphics/sci_gateway/c/sci_param3d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot3d.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/integer/includes/gw_integer.h
scilab/modules/integer/sci_gateway/c/gw_integer.c
scilab/modules/interpolation/includes/gw_interpolation.h
scilab/modules/interpolation/sci_gateway/c/gw_interpolation.c
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/c/sci_diary.c
scilab/modules/io/sci_gateway/c/sci_newest.c
scilab/modules/io/src/c/getpidc.c
scilab/modules/io/src/c/getpidc.h
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/linear_algebra/includes/gw_linear_algebra.h
scilab/modules/linear_algebra/includes/gw_linear_algebra2.h
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/linear_algebra/src/fortran/linear_algebra_f.vfproj
scilab/modules/localization/includes/gw_localization.h
scilab/modules/localization/sci_gateway/c/gw_localization.c
scilab/modules/metanet/includes/gw_metanet.h
scilab/modules/metanet/sci_gateway/c/gw_metanet.c
scilab/modules/mexlib/includes/mex.h
scilab/modules/mexlib/src/c/mexlib.c
scilab/modules/optimization/includes/gw_optim.h
scilab/modules/optimization/sci_gateway/c/gw_optim.c
scilab/modules/polynomials/includes/gw_polynomials.h
scilab/modules/polynomials/sci_gateway/c/gw_polynomials.c
scilab/modules/pvm/includes/gw_pvm.h
scilab/modules/pvm/sci_gateway/c/gw_pvm.c
scilab/modules/randlib/includes/gw_randlib.h [new file with mode: 0644]
scilab/modules/randlib/sci_gateway/c/gw_randlib.c
scilab/modules/randlib/sci_gateway/c/sci_grand.c
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/randlib/src/fortran/randlib_f.vfproj
scilab/modules/scicos/includes/gw_cscicos.h
scilab/modules/scicos/includes/gw_scicos.h
scilab/modules/scicos/sci_gateway/c/gw_cscicos.c
scilab/modules/scicos/sci_gateway/c/gw_scicos.c
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/sound/includes/gw_sound.h
scilab/modules/sound/sci_gateway/c/gw_sound.c
scilab/modules/sound/sci_gateway/c/sci_PlaySound.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/sound/sci_gateway/c/sci_loadwave.c
scilab/modules/sound/sci_gateway/c/sci_savewave.c
scilab/modules/sparse/includes/gw_sparse.h
scilab/modules/sparse/sci_gateway/c/gw_sparse.c
scilab/modules/special_functions/includes/gw_special_functions1.h
scilab/modules/special_functions/includes/gw_special_functions2.h
scilab/modules/special_functions/sci_gateway/c/gw_special_functions1.c
scilab/modules/special_functions/sci_gateway/c/gw_special_functions2.c
scilab/modules/statistics/includes/gw_statistics.h
scilab/modules/statistics/sci_gateway/c/gw_statistics.c
scilab/modules/string/includes/gw_string.h
scilab/modules/string/sci_gateway/c/gw_string.c
scilab/modules/symbolic/includes/gw_symbolic.h
scilab/modules/symbolic/sci_gateway/c/gw_symbolic.c
scilab/modules/tclsci/includes/gw_tclsci.h
scilab/modules/tclsci/sci_gateway/c/gw_tclsci.c
scilab/modules/time/includes/gw_time.h
scilab/modules/time/sci_gateway/c/gw_time.c
scilab/modules/wintools/includes/gw_wintools.h
scilab/modules/wintools/sci_gateway/c/gw_wintools.c
scilab/modules/wintools/sci_gateway/c/intpathname.c
scilab/modules/wintools/sci_gateway/c/sci_winopen.c
scilab/modules/wintools/sci_gateway/c/sci_winqueryreg.c

index 8172f4f..0f35310 100644 (file)
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="includes;src;../core/includes;../../libs/MALLOC/includes"
-                               PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="includes;src;../core/includes;../../libs/MALLOC/includes"
-                               PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
+                               RelativePath=".\includes\gw_arnoldi.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\resource.h"
                                >
                        </File>
diff --git a/scilab/modules/arnoldi/includes/gw_arnoldi.h b/scilab/modules/arnoldi/includes/gw_arnoldi.h
new file mode 100644 (file)
index 0000000..61f5c9c
--- /dev/null
@@ -0,0 +1,21 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2006 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#ifndef __GW_ARNOLDI_H__\r
+#define __GW_ARNOLDI_H__\r
+/*-----------------------------------------------------------------------------------*/\r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/\r
+int C2F(gw_arnoldi)(void);\r
+/*-----------------------------------------------------------------------------------*/\r
+int C2F(intdsaupd) _PARAMS((char *fname,unsigned long fname_len));\r
+int C2F(intdnaupd) _PARAMS((char *fname,unsigned long fname_len));\r
+int C2F(intznaupd) _PARAMS((char *fname,unsigned long fname_len));\r
+int C2F(intdseupd) _PARAMS((char *fname,unsigned long fname_len));\r
+int C2F(intdneupd) _PARAMS((char *fname,unsigned long fname_len));\r
+int C2F(intzneupd) _PARAMS((char *fname,unsigned long fname_len));\r
+/*-----------------------------------------------------------------------------------*/\r
+#endif /* __GW_ARNOLDI_H__ */\r
+/*-----------------------------------------------------------------------------------*/\r
+\r
index 167a2e7..ac5a7b8 100644 (file)
 #endif
 #include "stack-c.h"
 #include "sciprint.h"
+#include "gw_arnoldi.h"
 /*-----------------------------------------------------------------------------------*/
 typedef int (*Arpack_Interf) __PARAMS((char *fname,unsigned long l));
-
 typedef struct table_struct 
 {
        Arpack_Interf f;    /** function **/
        char *name;      /** its name **/
 } ArpackTable;
 /*-----------------------------------------------------------------------------------*/
-extern int C2F(intdsaupd) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intdnaupd) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intznaupd) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intdseupd) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intdneupd) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intzneupd) _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/
-int C2F(gw_arnoldi)(void);
-/*-----------------------------------------------------------------------------------*/
 static ArpackTable Tab[]={
   {C2F(intdsaupd),"dsaupd"},
   {C2F(intdnaupd),"dnaupd"},
index 5acc321..ed6bb5c 100644 (file)
@@ -12,6 +12,8 @@ src/fortran/find.f
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 sci_gateway/c/sci_or.c \
+sci_gateway/c/sci_find.c \
+sci_gateway/c/sci_bool2s.c \
 sci_gateway/c/gw_boolean.c
 
 GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_bool2s.f \
index 23a3056..34897ef 100644 (file)
@@ -4,25 +4,15 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_BOOLEAN__
 #define __GW_BOOLEAN__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Boolean_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Boolean_Interf f;    /** function **/
-       char *name;      /** its name **/
-} BooleanTable;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_boolean)(void);
+/*-----------------------------------------------------------------------------------*/
+int C2F(intor) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(intand) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_find) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_bool2s) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_BOOLEAN__ */
 /*-----------------------------------------------------------------------------------*/
index ad72c5a..e32193f 100644 (file)
@@ -1,20 +1,24 @@
-#include "gw_boolean.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
+/*-----------------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
 /*-----------------------------------------------------------------------------------*/
-static int C2F(sci_find) _PARAMS((char *fname,unsigned long fname_len));
-static int C2F(sci_bool2s) _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/
-extern int C2F(intor) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intand) _PARAMS((char *fname,unsigned long fname_len));
+#include "gw_boolean.h"
+#include "stack-c.h"
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
-int C2F(gw_boolean)(void);
+typedef int (*Boolean_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Boolean_Interf f;    /** function **/
+       char *name;      /** its name **/
+} BooleanTable;
 /*-----------------------------------------------------------------------------------*/
 static BooleanTable Tab[]=
 {
@@ -45,17 +49,3 @@ int C2F(gw_boolean)()
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
-static int C2F(sci_find) _PARAMS((char *fname,unsigned long fname_len))
-{
-       extern int C2F(intfind)();
-       C2F(intfind)();
-       return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-static int C2F(sci_bool2s) _PARAMS((char *fname,unsigned long fname_len))
-{
-       extern int C2F(intsbool2s)();
-       C2F(intsbool2s)();
-       return 0;
-}
-/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/modules/boolean/sci_gateway/c/sci_bool2s.c b/scilab/modules/boolean/sci_gateway/c/sci_bool2s.c
new file mode 100644 (file)
index 0000000..a3b8dee
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(sci_bool2s) _PARAMS((char *fname,unsigned long fname_len))\r
+{\r
+       extern int C2F(intsbool2s)();\r
+       C2F(intsbool2s)();\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/\r
diff --git a/scilab/modules/boolean/sci_gateway/c/sci_find.c b/scilab/modules/boolean/sci_gateway/c/sci_find.c
new file mode 100644 (file)
index 0000000..a3b37f5
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(sci_find) _PARAMS((char *fname,unsigned long fname_len))\r
+{\r
+       extern int C2F(intfind)();\r
+       C2F(intfind)();\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
index 7702c1f..66bd98a 100644 (file)
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
-                               PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                UsePrecompiledHeader="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
-                               PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\c\sci_bool2s.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\sci_find.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\sci_or.c"
                                >
                        </File>
index 2302a6a..ff62574 100644 (file)
@@ -4,26 +4,16 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_CACSD0__
 #define __GW_CACSD0__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Cacsd0_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Cacsd0_Interf f;    /** function **/
-  char *name;      /** its name **/
-} Cacsd0Table;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_cacsd0)(void);
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_gschur) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_gspec) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_ereduc) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_fstair) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_CACSD0__ */
 /*-----------------------------------------------------------------------------------*/
 
index 70a1fa3..ab72b28 100644 (file)
@@ -4,27 +4,15 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_CACSD1__
 #define __GW_CACSD1__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Cacsd1_Interf)  __PARAMS((char *fname,unsigned long l));
-typedef struct table_struct 
-{
-  Cacsd1_Interf f;    /** function **/
-  char *name;      /** its name **/
-
-} Cacsd1Table;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_cacsd1)(void);
+/*-----------------------------------------------------------------------------------*/
+int C2F(scilyap) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(scisylv) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(intricc)  _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_CACSD1__ */
 /*-----------------------------------------------------------------------------------*/
 
index 51a5743..3701e5e 100644 (file)
@@ -4,26 +4,17 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_CACSD2__
 #define __GW_CACSD2__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Cacsd2_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Cacsd2_Interf f;    /** function **/
-  char *name;      /** its name **/
-} Cacsd2Table;
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_cacsd2)(void);
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(sci_ppol) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_tzer) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_freq) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_ltitr) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_rtitr) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_GW_CACSD2__ */
 /*-----------------------------------------------------------------------------------*/
 
index 933d0e0..9eb5f14 100644 (file)
@@ -4,26 +4,15 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_CACSD3__
 #define __GW_CACSD3__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Cacsd3_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Cacsd3_Interf f;    /** function **/
-  char *name;      /** its name **/
-} Cacsd3Table;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_cacsd3)(void);
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(sci_arl2) _PARAMS((char *fname,unsigned long fname_len));
+extern int C2F(sci_residu) _PARAMS((char *fname,unsigned long fname_len));
+extern int C2F(sci_ldiv) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_CACSD3__ */
 /*-----------------------------------------------------------------------------------*/
 
diff --git a/scilab/modules/cacsd/includes/gw_slicot.h b/scilab/modules/cacsd/includes/gw_slicot.h
new file mode 100644 (file)
index 0000000..53e804d
--- /dev/null
@@ -0,0 +1,29 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#ifndef __GW_SLICOT_H__\r
+#define __GW_SLICOT_H__\r
+/*-----------------------------------------------------------------------------------*/\r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/\r
+#ifndef __DEF_MXARRAY__\r
+#define __DEF_MXARRAY__\r
+typedef int mxArray;\r
+typedef int Gatefunc __PARAMS((int nlhs,mxArray *plhs[],int nrhs,mxArray *prhs[]));\r
+#endif\r
+/*-----------------------------------------------------------------------------------*/ \r
+extern Gatefunc C2F(sident);\r
+extern Gatefunc C2F(sorder);\r
+extern Gatefunc C2F(findbd);\r
+extern Gatefunc C2F(intmucomp);\r
+extern Gatefunc C2F(intricc2);\r
+extern Gatefunc C2F(inthinf);\r
+extern Gatefunc C2F(intdhinf);\r
+extern Gatefunc C2F(intlinmeq);\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(gw_slicot)(void);\r
+/*-----------------------------------------------------------------------------------*/\r
+#endif /*  __GW_SLICOT_H__ */\r
+/*-----------------------------------------------------------------------------------*/\r
+\r
index ad4ec60..288f328 100644 (file)
@@ -1,19 +1,23 @@
-#include "gw_cacsd0.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
 /*-----------------------------------------------------------------------------------*/
-extern int C2F(sci_gschur) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_gspec) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_ereduc) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_fstair) _PARAMS((char *fname,unsigned long fname_len));
+#include "gw_cacsd0.h"
+#include "stack-c.h"
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
-int C2F(gw_cacsd0)(void);
+typedef int (*Cacsd0_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Cacsd0_Interf f;    /** function **/
+       char *name;      /** its name **/
+} Cacsd0Table;
 /*-----------------------------------------------------------------------------------*/
 static Cacsd0Table Tab[]=
 {
index 4a0bac3..7347cfa 100644 (file)
@@ -1,4 +1,3 @@
-#include "gw_cacsd1.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
@@ -7,12 +6,16 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_cacsd1.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-extern int C2F(scilyap) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(scisylv) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(intricc)  _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/
-int C2F(gw_cacsd1)(void);
+typedef int (*Cacsd1_Interf)  __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Cacsd1_Interf f;    /** function **/
+       char *name;      /** its name **/
+
+} Cacsd1Table;
 /*-----------------------------------------------------------------------------------*/
 static Cacsd1Table Tab[]=
 {
index 84bed01..98b436e 100644 (file)
@@ -1,4 +1,3 @@
-#include "gw_cacsd2.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
@@ -7,14 +6,17 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_cacsd2.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-extern int C2F(sci_ppol) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_tzer) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_freq) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_ltitr) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_rtitr) _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/
-int C2F(gw_cacsd2)(void);
+
+typedef int (*Cacsd2_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Cacsd2_Interf f;    /** function **/
+       char *name;      /** its name **/
+} Cacsd2Table;
+
 /*-----------------------------------------------------------------------------------*/
 static int C2F(sci_xxxx)_PARAMS((char *fname,unsigned long fname_len))
 {
index eae68e7..2552ec2 100644 (file)
@@ -1,4 +1,3 @@
-#include "gw_cacsd3.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
@@ -7,12 +6,15 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_cacsd3.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-extern int C2F(sci_arl2) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_residu) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_ldiv) _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/
-int C2F(gw_cacsd3)(void);
+typedef int (*Cacsd3_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Cacsd3_Interf f;    /** function **/
+       char *name;      /** its name **/
+} Cacsd3Table;
 /*-----------------------------------------------------------------------------------*/
 static Cacsd3Table Tab[]=
 {
index 892c077..c412033 100644 (file)
@@ -6,20 +6,11 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-#include "sci_contr.h"
-#include "sci_rankqr.h"
 #include "../../../mexlib/includes/mex.h"
-/*-----------------------------------------------------------------------------------*/ 
-extern Gatefunc C2F(sident);
-extern Gatefunc C2F(sorder);
-extern Gatefunc C2F(findbd);
-extern Gatefunc C2F(intmucomp);
-extern Gatefunc C2F(intricc2);
-extern Gatefunc C2F(inthinf);
-extern Gatefunc C2F(intdhinf);
-extern Gatefunc C2F(intlinmeq);
-/*-----------------------------------------------------------------------------------*/ 
-int C2F(gw_slicot)(void);
+#include "sci_rankqr.h"
+#include "sci_contr.h"
+#include "gw_slicot.h"
+
 /*-----------------------------------------------------------------------------------*/ 
 static GenericTable Tab[]={
   {(Myinterfun) fortran_mex_gateway, C2F(sident),"sident"},
index d147cd2..597af18 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\gw_slicot.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\sci_contr.h"
                                >
                        </File>
index 8f82588..8449fe1 100644 (file)
@@ -6,33 +6,33 @@
                <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)linear_algebra_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linear_algebra_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
-                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmtd.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremdd.lib /DLL libmmdd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/slicot_f.pdb" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\..\bin\dumpexts -o %%~nf.def -n slicot_f.dll %%f &gt;nul
 copy *.def slicot_f.def &gt;nul
 copy slicot_f.def ..\slicot_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build slicot.def"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
+copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build slicot.def"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)linear_algebra_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linear_algebra_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
-                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" UseProcessorExtensions="codeForStreamingSIMD" RequireProcessorExtensions="codeExclusivelyStreamingSIMD" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib"/>
+                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\..\bin\dumpexts -o %%~nf.def -n slicot_f.dll %%f &gt;nul
 copy *.def slicot_f.def &gt;nul
 copy slicot_f.def ..\slicot_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build slicot.def"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
+copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build slicot.def"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="..\ab01nd.f"/>
index c9c08b9..1387aae 100644 (file)
@@ -24,7 +24,6 @@ src/c/IsAScalar.c \
 src/c/texmacs.c \
 src/c/userf2.c \
 src/c/msgstxt.c \
-src/c/matusr.c \
 src/c/sciquit.c \
 src/c/readline.c \
 src/c/stack1.c \
@@ -51,7 +50,6 @@ src/c/banier.c \
 src/c/callinterf.c \
 src/c/isanan.c \
 src/c/parse.c \
-src/c/matus2.c \
 src/c/timer.c \
 src/c/stack2.c \
 src/c/Scierror.c \
@@ -261,6 +259,8 @@ sci_gateway/c/sci_iserror.c \
 sci_gateway/c/sci_getversion.c \
 sci_gateway/c/sci_debug.c \
 sci_gateway/c/gw_core.c \
+sci_gateway/c/gw_user.c \
+sci_gateway/c/gw_user2.c \
 sci_gateway/c/sci_error.c \
 sci_gateway/c/sci_sciargs.c \
 sci_gateway/c/sci_with_module.c \
index 89d6abc..3faf10e 100644 (file)
@@ -4,27 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_CORE__
 #define __GW_CORE__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_core)(void);
-
-typedef int (*Core_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Core_Interf f;    /** function **/
-  char *name;      /** its name **/
-} CoreTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_debug) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_who) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_lines) _PARAMS((char *fname,unsigned long fname_len));
@@ -91,8 +75,7 @@ int C2F(sci_warning) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_getmodules) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_with_module) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_getdynlibext) _PARAMS((char *fname,unsigned long fname_len));
-
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_CORE__ */
 /*-----------------------------------------------------------------------------------*/
 
similarity index 57%
rename from scilab/modules/core/src/c/matusr.h
rename to scilab/modules/core/includes/gw_user.h
index caa77f9..109bf63 100644 (file)
@@ -2,5 +2,12 @@
 /* INRIA 2006 */
 /* Ledru Sylvestre */
 /*-----------------------------------------------------------------------------------*/
+#ifndef __GW_USER_H__
+#define __GW_USER_H__
+
+#include "machine.h"
 
 int C2F(gw_user)(void);
+
+#endif /*__GW_USER_H__*/
+/*-----------------------------------------------------------------------------------*/
similarity index 50%
rename from scilab/modules/core/src/c/matus2.h
rename to scilab/modules/core/includes/gw_user2.h
index ca442d4..7f2fb44 100644 (file)
@@ -1,7 +1,14 @@
-/*-----------------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Ledru Sylvestre */
-/*-----------------------------------------------------------------------------------*/
-
-
-int C2F(gw_user2)(void);
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2006 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/\r
+#ifndef __GW_USER2_H__\r
+#define __GW_USER2_H__\r
+\r
+#include "machine.h"\r
+\r
+int C2F(gw_user2)(void);\r
+\r
+#endif /*__GW_USER2_H__*/\r
+/*-----------------------------------------------------------------------------------*/\r
+\r
index 2fcf3b4..93e5dbd 100644 (file)
@@ -2,11 +2,20 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-#include "gw_core.h"
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_core.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Core_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Core_Interf f;    /** function **/
+       char *name;      /** its name **/
+} CoreTable;
 /*-----------------------------------------------------------------------------------*/
 static CoreTable Tab[]=
 {
similarity index 95%
rename from scilab/modules/core/src/c/matusr.c
rename to scilab/modules/core/sci_gateway/c/gw_user.c
index 73fca01..6383de9 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
-#include "matusr.h"
+#include "gw_user.h"
 /*-----------------------------------------------------------------------------------*/ 
  int C2F(gw_user)()
 {
similarity index 82%
rename from scilab/modules/core/src/c/matus2.c
rename to scilab/modules/core/sci_gateway/c/gw_user2.c
index fadba6d..f24f648 100644 (file)
@@ -1,13 +1,14 @@
-/*-----------------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Allan CORNET */
-/*-----------------------------------------------------------------------------------*/ 
-#include "machine.h"
-#include "matus2.h"
-/*-----------------------------------------------------------------------------------*/ 
-int C2F(gw_user2)()
-{
-    return 0;
-} 
-/*-----------------------------------------------------------------------------------*/ 
-
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2006 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include "machine.h"\r
+#include "stack-c.h"\r
+#include "gw_user2.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+ int C2F(gw_user2)()\r
+{\r
+   return 0;\r
+} \r
+/*-----------------------------------------------------------------------------------*/ \r
+\r
index 62fde25..f1a2ede 100644 (file)
@@ -2,9 +2,10 @@
 /* INRIA 2007 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
-#include "gw_core.h"
 #include "MALLOC.h"
 #include "machine.h"
+#include "stack-c.h"
+#include "gw_core.h"
 /*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_getdynlibext) _PARAMS((char *fname,unsigned long fname_len))
 {
index 7af11fe..83fb2d6 100644 (file)
@@ -2,10 +2,10 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
+#include "history.h"
 #include "gw_core.h"
 #include "machine.h"
 #include "stack-c.h"
-#include "history.h"
 /*-----------------------------------------------------------------------------------*/
 extern int C2F(gethistory) _PARAMS((char *fname));
 /*-----------------------------------------------------------------------------------*/
index cd7074d..be7ea47 100644 (file)
@@ -2,10 +2,10 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
+#include "../../src/c/history.h"
 #include "gw_core.h"
 #include "machine.h"
 #include "stack-c.h"
-#include "../../src/c/history.h"
 /*-----------------------------------------------------------------------------------*/
 extern int C2F(resethistory) _PARAMS((char *fname));
 /*-----------------------------------------------------------------------------------*/
index 73cb42f..62211c3 100644 (file)
@@ -2,21 +2,12 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
+#include "../../src/c/history.h"
 #include "gw_core.h"
-#include "machine.h"
 #include "stack-c.h"
-#include "../../src/c/history.h"
-/*-----------------------------------------------------------------------------------*/
-extern int C2F(savehistory) _PARAMS((char *fname));
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_savehistory) _PARAMS((char *fname,unsigned long fname_len))
 {
-       C2F(savehistory)(fname);
-       return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-int C2F(savehistory) _PARAMS((char *fname))
-{
        char  line[MAXBUF];
        char *Path;
        int l1, m1, n1, out_n;
index 1398eee..8e49a73 100644 (file)
@@ -9,6 +9,7 @@
 #include "stackinfo.h"
 #include "error_scilab.h"
 #include "message_scilab.h"
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 #define LengthNameVariableScilabMax 24
 /*-----------------------------------------------------------------------------------*/
@@ -314,8 +315,8 @@ int C2F(sci_who) _PARAMS((char *fname,unsigned long fname_len))
         }
  }
  /*-----------------------------------------------------------------------------------*/
-  static void DispVariables(struct VariableStruct* Vstruct,char *Message,int lenStructArray,int memused,int memtotal,int varused,int vartotal)
- {
+static void DispVariables(struct VariableStruct* Vstruct,char *Message,int lenStructArray,int memused,int memtotal,int varused,int vartotal)
+{
         int i=0;
 
         sciprint("\n%s\n\n",Message);
@@ -329,9 +330,9 @@ int C2F(sci_who) _PARAMS((char *fname,unsigned long fname_len))
         message_scilab("core_message_140",memused,memtotal);
         message_scilab("core_message_141",varused,vartotal);
 
- }
- /*-----------------------------------------------------------------------------------*/
- static BOOL FreeVariableStructArray(struct VariableStruct* Vstruct,int lenStructArray)
+}
+/*-----------------------------------------------------------------------------------*/
+static BOOL FreeVariableStructArray(struct VariableStruct* Vstruct,int lenStructArray)
  {
         BOOL bOK=FALSE;
         if (Vstruct)
index 1900548..c7035b4 100644 (file)
@@ -3,6 +3,7 @@
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
 #include "gw_core.h"
+#include "stack-c.h"
 #include "with_module.h"
 #include "MALLOC.h"
 #include "error_scilab.h"
index a9ddccc..eea1e21 100644 (file)
@@ -7,7 +7,7 @@
 #include <ctype.h>
 #include <signal.h>
 
-#include "machine.h"
+
 #include "sciprint.h"
 #include "csignal.h"
 
@@ -18,6 +18,8 @@
 #include "message_scilab.h"
 #include "callinterf.h"
 
+#include "machine.h"
+
 static  jmp_buf jmp_env; 
 
 extern int C2F(error) __PARAMS((int *));
@@ -111,6 +113,8 @@ int C2F(callinterf) (int *k)
   return 0;
 }
 
+
+
 static void sci_sigint_addinter(int n)
 {
   int c;
@@ -120,6 +124,8 @@ static void sci_sigint_addinter(int n)
   if ( c == 'y' ) errjump(n);
 }
 
+
+
 /*-------------------------------------
  * long jump to stop interface computation 
  *-------------------------------------*/
index bb16526..d4b50e2 100644 (file)
  *  to add a new interface add a declaration and a new entry 
  *  at the end of the Interfaces array 
  *  The maximum number of interfaces is bound to DynInterfStart 
- *                                 ( file /core/src/c/addinter.h ) 
+ *  ( file /core/src/c/addinter.h ) 
  ********************************************************/
 
-/** table of interfaces **/
-
-typedef  struct  {
-  void  (*fonc)();
-} OpTab ;
-
-
-void errjump(int n);
-void C2F(no_gw_tclsci)(void);
-void C2F(NoPvm)(void);
-void C2F(Nogw_scicos)(void);
-void C2F(Nogw_cscicos)(void);
-void C2F(Nogw_slicot)(void);
-void C2F(Nogw_fftw)(void);
-
-/* 01  C2F(gw_user)(); FREE */
-extern void    /* 02  */ C2F(gw_linear_algebra)(void);
+/* 01  C2F(gw_user)(); FREE */ #include "gw_user.h" 
+/* 02 */                                               #include "../../../linear_algebra/includes/gw_linear_algebra.h" 
 /* 03  C2F(gw_user)(); FREE */
 /* 04  C2F(gw_user)(); FREE */
-extern void    /* 05  */ C2F(gw_io)(void);
-extern void    /* 06  */ C2F(gw_elementaries_functions)(void);
-extern void    /* 07  */ C2F(gw_graphics)(void);
-extern void    /* 08  */ C2F(gw_cacsd0)(void);
-extern void    /* 09  */ C2F(gw_cacsd1)(void);
-extern void    /* 10  */ C2F(gw_cacsd2)(void);
-extern void    /* 11  */ C2F(gw_optim)(void);
-extern void    /* 12  */ C2F(gw_differential_equations1)(void);
-extern void    /* 13  */ C2F(gw_core)(void);
-extern void    /* 14  */ C2F(gw_user)(void);
-extern void    /* 15  */ C2F(gw_metanet)(void);
-extern void    /* 16  */ C2F(gw_polynomials)(void);
-extern void    /* 17  */ C2F(gwdatastructures1)(void);
-extern void    /* 18  */ C2F(gw_signal)(void);
-extern void    /* 19  */ C2F(gw_interpolation)(void);
-extern void    /* 20  */ C2F(gw_cacsd3)(void);
-extern void    /* 21  */ C2F(gw_string)(void);
-extern void    /* 22  */ C2F(gw_symbolic)(void);
-extern void    /* 23  */ C2F(gw_boolean)(void);
-extern void    /* 24  */ C2F(gw_user2)(void);
-extern void    /* 25  */ C2F(gw_gui)(void);
-extern void    /* 26  */ C2F(gw_differential_equations2)(void);
-extern void    /* 27  */ C2F(gw_sparse)(void);
-extern void    /* 28  */ C2F(gw_slicot)(void);
-extern void    /* 29  */ C2F(gw_differential_equations3)(void);
-extern void    /* 30  */ C2F(gw_differential_equations4)(void);
-extern void    /* 31  */ C2F(gw_differential_equations5)(void);
-extern void    /* 32  */ C2F(gw_differential_equations6)(void);
-/* 33  */ /* FREE */
-extern void    /* 34  */ C2F(gw_fileio)(void);
-extern void    /* 35  */ C2F(gw_arnoldi)(void);
-extern void    /* 36  */ C2F(gw_special_functions1)(void);
-extern void    /* 37  */ C2F(gw_statistics)(void);
-extern void    /* 38  */ C2F(gw_randlib)(void);
-extern void    /* 39  */ C2F(gw_special_functions2)(void);
-
-#ifdef WITH_TK
-extern void    /* 40  */ C2F(gw_tclsci)(void);
+/* 05 */                                               #include "../../../io/includes/gw_io.h" 
+/* 06 */                                               #include "../../../elementaries_functions/includes/gw_elementaries_functions.h"
+/* 07 */                                               #include "../../../graphics/includes/gw_graphics.h"
+/* 08 */                                               #include "../../../cacsd/includes/gw_cacsd0.h"
+/* 09 */                                               #include "../../../cacsd/includes/gw_cacsd1.h"
+/* 10 */                                               #include "../../../cacsd/includes/gw_cacsd2.h"
+/* 11 */                                               #include "../../../optimization/includes/gw_optim.h"
+/* 12 */                                               #include "../../../differential_equations/includes/gw_differential_equations1.h"
+/* 13 */                                               #include "gw_core.h"
+/* 14  C2F(gw_user)(); FREE */
+/* 15 */                                               #include "../../../metanet/includes/gw_metanet.h"
+/* 16 */                                               #include "../../../polynomials/includes/gw_polynomials.h"
+/* 17 */                                               #include "../../../data_structures/includes/gw_data_structures1.h"
+/* 18 */                                               #include "../../../signal_processing/includes/gw_signal.h"
+/* 19 */                                               #include "../../../interpolation/includes/gw_interpolation.h"
+/* 20 */                                               #include "../../../cacsd/includes/gw_cacsd3.h"
+/* 21 */                                               #include "../../../string/includes/gw_string.h"
+/* 22 */                                               #include "../../../symbolic/includes/gw_symbolic.h"
+/* 23 */                                               #include "../../../boolean/includes/gw_boolean.h"
+/* 24  C2F(gw_user2)(); FREE */        #include "gw_user2.h" 
+/* 25 */                                               #include "../../../gui/includes/gw_gui.h"
+/* 26 */                                               #include "../../../differential_equations/includes/gw_differential_equations2.h"
+/* 27 */                                               #include "../../../sparse/includes/gw_sparse.h"
+/* 28 */                                               #include "../../../cacsd/includes/gw_slicot.h"
+/* 29 */                                               #include "../../../differential_equations/includes/gw_differential_equations3.h"
+/* 30 */                                               #include "../../../differential_equations/includes/gw_differential_equations4.h"
+/* 31 */                                               #include "../../../differential_equations/includes/gw_differential_equations5.h"
+/* 32 */                                               #include "../../../differential_equations/includes/gw_differential_equations6.h"
+/* 33  C2F(gw_user)(); FREE */
+/* 34 */                                               #include "../../../fileio/includes/gw_fileio.h"
+/* 35 */                                               #include "../../../arnoldi/includes/gw_arnoldi.h"
+/* 36 */                                               #include "../../../special_functions/includes/gw_special_functions1.h"
+/* 37 */                                               #include "../../../statistics/includes/gw_statistics.h"
+/* 38 */                                               #include "../../../randlib/includes/gw_randlib.h"
+/* 39 */                                               #include "../../../special_functions/includes/gw_special_functions2.h"
+
+#if defined(WITH_TK) || defined(_MSC_VER)
+/* 40 */                                               #include "../../../tclsci/includes/gw_tclsci.h"
 #define TCLINTERF C2F(gw_tclsci)
 #else 
+void C2F(no_gw_tclsci)(void);
 #define TCLINTERF C2F(no_gw_tclsci)
 #endif
 
-extern void    /* 41  */ C2F(gwdatastructures2)(void);
+/* 41 */                                               #include "../../../data_structures/includes/gw_data_structures2.h"
 
 #ifdef WITH_PVM
-extern void    /* 42  */ C2F(gw_pvm)(void);
+/* 42 */                                               #include "../../../pvm/includes/gw_pvm.h"
 #define PVMINTERF C2F(gw_pvm)
 #else 
+void C2F(NoPvm)(void);
 #define PVMINTERF C2F(NoPvm)
 #endif
 
-extern void    /* 43  */ C2F(gw_integer)(void);
-extern void    /* 44  */ C2F(gw_linear_algebra2)(void);
+/* 43 */                                               #include "../../../integer/includes/gw_integer.h"
+/* 44 */                                               #include "../../../linear_algebra/includes/gw_linear_algebra2.h" 
 
 #ifdef WITHOUT_SCICOS
-       #define SCICOSINTERF1 C2F(Nogw_scicos)
-       #define SCICOSINTERF2 C2F(Nogw_cscicos)
+void C2F(Nogw_scicos)(void);
+void C2F(Nogw_cscicos)(void);
+#define SCICOSINTERF1 C2F(Nogw_scicos)
+#define SCICOSINTERF2 C2F(Nogw_cscicos)
 #else
-       extern void    /* 45  */ C2F(gw_scicos)(void);
-       #define SCICOSINTERF1 C2F(gw_scicos)
-       extern void    /* 46  */ C2F(gw_cscicos)(void);
-       #define SCICOSINTERF2 C2F(gw_cscicos)
+/* 45 */                                               #include "../../../scicos/includes/gw_scicos.h"
+#define SCICOSINTERF1 C2F(gw_scicos)
+/* 46 */                                               #include "../../../scicos/includes/gw_cscicos.h"
+#define SCICOSINTERF2 C2F(gw_cscicos)
 #endif
 
-extern void    /* 47  */ C2F(gw_wintools)(void);
-extern void    /* 48  */ C2F(gw_time)(void);
-extern void    /* 49  */ C2F(gw_sound)(void);
-extern void    /* 50  */ C2F(gw_localization)(void);
+/* 47 */                                               #include "../../../wintools/includes/gw_wintools.h"
+/* 48 */                                               #include "../../../time/includes/gw_time.h"
+/* 49 */                                               #include "../../../sound/includes/gw_sound.h"
+/* 50 */                                               #include "../../../localization/includes/gw_localization.h"
 
 #if defined(WITH_FFTW) || defined(_MSC_VER)
-extern void    /* 51  */ C2F(gw_fftw)(void);
+/* 51 */                                               #include "../../../fftw/includes/gw_fftw.h"
 #define FFTWINTERF C2F(gw_fftw)
 #else 
+void C2F(Nogw_fftw)(void);
 #define FFTWINTERF C2F(Nogw_fftw)
 #endif
 
+void errjump (int n);
+
+
+/** table of interfaces **/
+
+typedef  struct  {
+       void  (*fonc)();
+} OpTab ;
+
+
 static OpTab Interfaces[] = {
     /* 01  */ {C2F(gw_user)}, /* free position may be used */
        /* 02  */ {C2F(gw_linear_algebra)},
index cd6c607..1642a3c 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\c\gw_user.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\gw_user2.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\hashtable_core.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\matus2.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\matusr.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\md5.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\gw_user.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\includes\gw_user2.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\hashtable_core.h"
                                >
                        </File>
index 93ec708..f9f74af 100644 (file)
@@ -908,7 +908,7 @@ void *mxGetImagData(const mxArray *ptr)
 void mexErrMsgTxt(char *error_msg)
 {
   cerro(error_msg);
-  errjump();
+  errjump(0);
 }
 
 void mxAssert(int expr, char *error_message)
@@ -2214,7 +2214,7 @@ int mexEvalString(char *name)
   mxFreeMatrix(ppr[0]);
   if ( rep == 1 || (int) (*val) != 0 )
     {
-      errjump();
+      errjump(0);
     }
   return rep;
 }
@@ -2754,7 +2754,7 @@ void  C2F(mexprintf)(char *error_msg, int len)
 void C2F(mexerrmsgtxt)(char *error_msg, int len)
 {
   C2F(erro)(error_msg,len);
-  errjump();
+  errjump(0);
 }
 
 mxArray *C2F(mxcreatefull)(int *m, int *n, int *it)
index b10ffbe..bf18bbf 100644 (file)
@@ -5,10 +5,11 @@
 /* *------------------------------------------------------------------ */
 #include <string.h>
 #include <stdio.h>
+#include "timer.h"
 #include "stack-c.h"
+
 #include "parse.h"
-#include "timer.h"
-#include "callinterf.h"
+
 
 #undef Lstk
 #undef Infstk
@@ -95,6 +96,7 @@ extern int C2F(error)();
 extern logical C2F(compil)();
 extern logical C2F(eptover)();
 extern logical C2F(Ptover)();
+extern int C2F(callinterf) (int *k);
 
 void handle_onprompt(int *n);
 
index 1f0eefd..3e8d3eb 100644 (file)
@@ -2,7 +2,11 @@
 /* INRIA 2006 */
 /* Ledru Sylvestre */
 /*-----------------------------------------------------------------------------------*/
-
+#ifndef __PARSE_H__
+#define __PARSE_H__
+/*-----------------------------------------------------------------------------------*/
+#include "machine.h"
+/*-----------------------------------------------------------------------------------*/
 typedef int logical;
 void Msgs(int n,int ierr);
 void SciError(int n);
@@ -11,3 +15,6 @@ logical Eptover(int n);
 logical Ptover(int n);
 int C2F(syncexec)(char *str, int *ns, int *ierr, int *seq, long int str_len);
 void C2F(parsecomment)(void);
+/*-----------------------------------------------------------------------------------*/
+#endif /* __PARSE_H__ */
+/*-----------------------------------------------------------------------------------*/
index e068c3e..543b918 100644 (file)
@@ -25,6 +25,8 @@ GATEWAY_C_SOURCES = sci_gateway/c/sci_lsslist.c \
 sci_gateway/c/sci_glist.c \
 sci_gateway/c/sci_mlist.c \
 sci_gateway/c/sci_definedfields.c \
+sci_gateway/c/sci_getfield.c \
+sci_gateway/c/sci_setfield.c \
 sci_gateway/c/sci_lstcat.c \
 sci_gateway/c/sci_list.c \
 sci_gateway/c/gw_data_structures1.c \
index 2bdc372..f954ad5 100644 (file)
@@ -4,29 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DATA_STRUCTURES1__
 #define __GW_DATA_STRUCTURES1__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gwdatastructures1)(void);
-
-typedef int (*Data_structures1_Interf) __PARAMS((char *fname,unsigned long fname_len));
-
-typedef struct table_struct 
-{
-       Data_structures1_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DataStructures1Table;
-
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(sci_glist) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_scilist) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_lsslist) _PARAMS((char *fname,unsigned long fname_len));
@@ -36,7 +18,7 @@ int C2F(sci_lstcat) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_scimlist) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_definedfields) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_lstsize) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_DATA_STRUCTURES1__ */
 /*-----------------------------------------------------------------------------------*/
 
index e768025..c2d7d7a 100644 (file)
@@ -4,28 +4,19 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DATA_STRUCTURES2__
 #define __GW_DATA_STRUCTURES2__
-
+/*-----------------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 #include <windows.h>
 #include <stdio.h>
 #endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gwdatastructures2)(void);
-
-typedef int (*Data_structures2_Interf) __PARAMS((char *fname,unsigned long fname_len));
-
-typedef struct table_struct 
-{
-       Data_structures2_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DataStructures2Table;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_getfield) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_setfield) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_DATA_STRUCTURES2__ */
 /*-----------------------------------------------------------------------------------*/
 
index a7ead23..5b50013 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_data_structures1.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_data_structures1.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Data_structures1_Interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct 
+{
+       Data_structures1_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DataStructures1Table;
 /*-----------------------------------------------------------------------------------*/
 extern int C2F(error)();
 /*-----------------------------------------------------------------------------------*/
index ef1f01b..a49d64f 100644 (file)
@@ -1,31 +1,24 @@
-#include "gw_data_structures2.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_data_structures2.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
 extern int C2F(error)();
-/*-----------------------------------------------------------------------------------*/        
-static int C2F(sci_getfield) _PARAMS((char *fname,unsigned long fname_len))
-{
-       extern int C2F(intgetfield)();
-       
-       C2F(intgetfield)();
-       return 0;
-}
 /*-----------------------------------------------------------------------------------*/
-static int C2F(sci_setfield) _PARAMS((char *fname,unsigned long fname_len))
+typedef int (*Data_structures2_Interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct 
 {
-       extern int C2F(intsetfield)();
-       
-       C2F(intsetfield)();
-       return 0;
-}
-/*-----------------------------------------------------------------------------------*/
+       Data_structures2_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DataStructures2Table;
+/*-----------------------------------------------------------------------------------*/        
 static DataStructures2Table Tab[]=
 {
        {C2F(sci_getfield),"getfield"},
diff --git a/scilab/modules/data_structures/sci_gateway/c/sci_getfield.c b/scilab/modules/data_structures/sci_gateway/c/sci_getfield.c
new file mode 100644 (file)
index 0000000..8cb5213
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(sci_getfield) _PARAMS((char *fname,unsigned long fname_len))\r
+{\r
+       extern int C2F(intgetfield)();\r
+\r
+       C2F(intgetfield)();\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
diff --git a/scilab/modules/data_structures/sci_gateway/c/sci_setfield.c b/scilab/modules/data_structures/sci_gateway/c/sci_setfield.c
new file mode 100644 (file)
index 0000000..16bb66f
--- /dev/null
@@ -0,0 +1,14 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(sci_setfield) _PARAMS((char *fname,unsigned long fname_len))\r
+{\r
+       extern int C2F(intsetfield)();\r
+\r
+       C2F(intsetfield)();\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
index 67127f3..1cf344d 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\c\sci_getfield.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\sci_glist.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\c\sci_setfield.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\sci_tlist.c"
                                >
                        </File>
index da5d7a6..c081b9c 100644 (file)
@@ -72,6 +72,7 @@ sci_gateway/c/sci_int2d.c \
 sci_gateway/c/sci_int3d.c \
 sci_gateway/c/sci_intg.c \
 sci_gateway/c/sci_ode.c \
+sci_gateway/c/sci_odc.c \
 sci_gateway/c/sci_feval.c \
 sci_gateway/c/gw_differential_equations1.c \
 sci_gateway/c/gw_differential_equations2.c \
index 53469cb..471c03d 100644 (file)
@@ -5,36 +5,15 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DIFFERENTIAL_EQUATIONS1__
 #define __GW_DIFFERENTIAL_EQUATIONS1__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-#ifdef _MSC_VER
-#include "ExceptionMessage.h"
-#endif
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_differential_equations1)(void);
-
-typedef int (*Differential_Equations1_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Differential_Equations1_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DifferentialEquations1Table;
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(sci_ode) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_intg) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_feval) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_bvode) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif  /* __GW_DIFFERENTIAL_EQUATIONS1__ */
 /*-----------------------------------------------------------------------------------*/
index df878bb..99428f6 100644 (file)
@@ -5,36 +5,14 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DIFFERENTIAL_EQUATIONS2__
 #define __GW_DIFFERENTIAL_EQUATIONS2__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-#ifdef _MSC_VER
-#include "ExceptionMessage.h"
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_differential_equations2)(void);
-
-typedef int (*Differential_Equations2_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Differential_Equations2_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DifferentialEquations2Table;
-
-extern int C2F(sciimpl) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(dassli) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(dasrti) _PARAMS((char *fname,unsigned long fname_len));
-
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(sciimpl) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(dassli) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(dasrti) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/ 
 #endif  /* __GW_DIFFERENTIAL_EQUATIONS2__ */
 /*-----------------------------------------------------------------------------------*/
index 96a4689..f6443d4 100644 (file)
@@ -5,34 +5,12 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DIFFERENTIAL_EQUATIONS3__
 #define __GW_DIFFERENTIAL_EQUATIONS3__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-#ifdef _MSC_VER
-#include "ExceptionMessage.h"
-#endif
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_differential_equations3)(void);
-
-typedef int (*Differential_Equations3_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Differential_Equations3_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DifferentialEquations3Table;
-
-static int C2F(sci_odc) _PARAMS((char *fname,unsigned long l));
-
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_odc) _PARAMS((char *fname,unsigned long l));
+/*-----------------------------------------------------------------------------------*/
 #endif  /* __GW_DIFFERENTIAL_EQUATIONS3__ */
 /*-----------------------------------------------------------------------------------*/
index c280e60..b9c72c3 100644 (file)
@@ -5,31 +5,14 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DIFFERENTIAL_EQUATIONS4__
 #define __GW_DIFFERENTIAL_EQUATIONS4__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_differential_equations4)(void);
-
-typedef int (*Differential_Equations4_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Differential_Equations4_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DifferentialEquations4Table;
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(sci_intg) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_int2d) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_int3d) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif  /* __GW_DIFFERENTIAL_EQUATIONS4__ */
 /*-----------------------------------------------------------------------------------*/
index 7dbf166..6134ce6 100644 (file)
@@ -5,34 +5,12 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DIFFERENTIAL_EQUATIONS5__
 #define __GW_DIFFERENTIAL_EQUATIONS5__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-#ifdef _MSC_VER
-#include "ExceptionMessage.h"
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_differential_equations5)(void);
-
-typedef int (*Differential_Equations5_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Differential_Equations5_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DifferentialEquations5Table;
-
-static int C2F(sci_feval) _PARAMS((char *fname,unsigned long fname_len));
-
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(sci_feval) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/ 
 #endif  /* __GW_DIFFERENTIAL_EQUATIONS5__ */
 /*-----------------------------------------------------------------------------------*/
index a1a894a..178a384 100644 (file)
@@ -5,33 +5,12 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_DIFFERENTIAL_EQUATIONS6__
 #define __GW_DIFFERENTIAL_EQUATIONS6__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-#ifdef _MSC_VER
-#include "ExceptionMessage.h"
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_differential_equations6)(void);
-
-typedef int (*Differential_Equations6_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Differential_Equations6_Interf f;    /** function **/
-       char *name;      /** its name **/
-} DifferentialEquations6Table;
-
-extern int C2F(scibvode) __PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(scibvode) __PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/ 
 #endif  /* __GW_DIFFERENTIAL_EQUATIONS6__ */
 /*-----------------------------------------------------------------------------------*/
index 10e8fbd..5e26307 100644 (file)
@@ -2,8 +2,22 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
+#ifdef _MSC_VER
+#include <windows.h>
+       #include <stdio.h>
+       #include "ExceptionMessage.h"
+#endif
+/*-----------------------------------------------------------------------------------*/
 #include "gw_differential_equations1.h"
-
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Differential_Equations1_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Differential_Equations1_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DifferentialEquations1Table;
 /*-----------------------------------------------------------------------------------*/
 static int C2F(sci_none_empty) _PARAMS((char *fname,unsigned long fname_len))
 {
@@ -18,7 +32,6 @@ static DifferentialEquations1Table Tab[]=
        {C2F(sci_feval),"feval"},
        {C2F(sci_bvode),"bvode"}
 };
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_differential_equations1)(void)
 {  
index 172c881..fd7619d 100644 (file)
@@ -2,9 +2,22 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-
+#ifdef _MSC_VER
+#include <windows.h>
+#include <stdio.h>
+#include "ExceptionMessage.h"
+#endif
+#include <string.h>
+/*-----------------------------------------------------------------------------------*/
 #include "gw_differential_equations2.h"
-
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Differential_Equations2_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Differential_Equations2_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DifferentialEquations2Table;
 /*-----------------------------------------------------------------------------------*/
 static DifferentialEquations2Table Tab[]=
 {
index 66fdd54..001345e 100644 (file)
@@ -2,20 +2,26 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
+#ifdef _MSC_VER
+#include <windows.h>
+#include <stdio.h>
+#include "ExceptionMessage.h"
+#endif
 #include "gw_differential_equations3.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-static int C2F(sci_odc) _PARAMS((char *fname,unsigned long l))
+typedef int (*Differential_Equations3_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
 {
-       extern int C2F(sciodc)();
-       C2F(sciodc)();
-       return 0;
-}
+       Differential_Equations3_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DifferentialEquations3Table;
 /*-----------------------------------------------------------------------------------*/
 static DifferentialEquations3Table Tab[]=
 {
        {C2F(sci_odc),"odc"}
 };
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_differential_equations3)(void)
 {  
index 90c7985..e8c2a18 100644 (file)
@@ -2,12 +2,21 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-#include "gw_differential_equations4.h"
+#include <string.h>
 #ifdef _MSC_VER
-#ifndef _DEBUG
+#include <windows.h>
+#include <stdio.h>
 #include "ExceptionMessage.h"
 #endif
-#endif
+#include "gw_differential_equations4.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Differential_Equations4_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Differential_Equations4_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DifferentialEquations4Table;
 /*-----------------------------------------------------------------------------------*/
 static DifferentialEquations4Table Tab[]=
 {
@@ -15,7 +24,6 @@ static DifferentialEquations4Table Tab[]=
        {C2F(sci_int2d),"int2d"},
        {C2F(sci_int3d),"int3d"}
 };
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_differential_equations4)(void)
 {  
index 3f34f4e..829bd7f 100644 (file)
@@ -2,17 +2,22 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-
+#include <string.h>
+#ifdef _MSC_VER
+#include <windows.h>
+#include <stdio.h>
+#include "ExceptionMessage.h"
+#endif
 #include "gw_differential_equations5.h"
-
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-static int C2F(sci_feval) _PARAMS((char *fname,unsigned long fname_len))
+typedef int (*Differential_Equations5_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
 {
-       extern int C2F(feval)();
-       C2F(feval)();
-       return 0;
-}
-/*-----------------------------------------------------------------------------------*/
+       Differential_Equations5_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DifferentialEquations5Table;
+/*-----------------------------------------------------------------------------------*/ 
 static DifferentialEquations5Table Tab[]=
 {
        {C2F(sci_feval),"feval"}
index 3f23b16..ef9a24c 100644 (file)
@@ -2,7 +2,22 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
+#ifdef _MSC_VER
+#include <windows.h>
+#include <stdio.h>
+#include "ExceptionMessage.h"
+#endif
+/*-----------------------------------------------------------------------------------*/
 #include "gw_differential_equations6.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Differential_Equations6_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Differential_Equations6_Interf f;    /** function **/
+       char *name;      /** its name **/
+} DifferentialEquations6Table;
 /*-----------------------------------------------------------------------------------*/
 static DifferentialEquations6Table Tab[]=
 {
diff --git a/scilab/modules/differential_equations/sci_gateway/c/sci_odc.c b/scilab/modules/differential_equations/sci_gateway/c/sci_odc.c
new file mode 100644 (file)
index 0000000..7a00de9
--- /dev/null
@@ -0,0 +1,13 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/\r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/\r
+int C2F(sci_odc) _PARAMS((char *fname,unsigned long l))\r
+{\r
+       extern int C2F(sciodc)();\r
+       C2F(sciodc)();\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/\r
index 84b2a9b..c449f34 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\c\sci_odc.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\sci_ode.c"
                                >
                        </File>
index db835c9..24f9d89 100644 (file)
@@ -4,29 +4,10 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_ELEMENTARIES_FUNCTIONS__
 #define __GW_ELEMENTARIES_FUNCTIONS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_elementaries_functions)(void);
-
-typedef int (*Elementaries_Functions_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Elementaries_Functions_Interf f;    /** function **/
-  char *name;      /** its name **/
-} ElementariesFunctionsTable;
-
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_abs) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_real) _PARAMS((char *fname,unsigned long fname_len));
@@ -75,7 +56,6 @@ int C2F(sci_nearfloat) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_dsearch) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_isequal) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_spones) _PARAMS((char *fname,unsigned long fname_len));
-
 #endif /*  __GW_ELEMENTARIES_FUNCTIONS__ */
 /*-----------------------------------------------------------------------------------*/
 
index 1fc84f0..a3adc88 100644 (file)
@@ -7,7 +7,15 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-
+#include "gw_elementaries_functions.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Elementaries_Functions_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Elementaries_Functions_Interf f;    /** function **/
+       char *name;      /** its name **/
+} ElementariesFunctionsTable;
 /*-----------------------------------------------------------------------------------*/
 static ElementariesFunctionsTable Tab[]=
 {
index 619c4bd..1873b11 100644 (file)
@@ -4,24 +4,10 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_FFTW__
 #define __GW_FFTW__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_fftw)(void);
-
-typedef int (*fftw_interf) __PARAMS((char *fname,unsigned long fname_len));
-
-typedef struct table_struct {
-  fftw_interf f;    /** function **/
-  char *name;      /** its name **/
-} intFFTWTable;
-
 /*-----------------------------------------------------------------------------------*/
 /* interface for the previous function Table */ 
 /*-----------------------------------------------------------------------------------*/ 
@@ -34,6 +20,6 @@ int sci_freefftw_plan __PARAMS((char *fname,unsigned long fname_len));
 int sci_loadfftwlibrary __PARAMS((char *fname,unsigned long fname_len));
 int sci_disposefftwlibrary __PARAMS((char *fname,unsigned long fname_len));
 int sci_fftwlibraryisloaded __PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_FFTW__ */
 /*-----------------------------------------------------------------------------------*/
index a447d46..ed52f71 100644 (file)
@@ -1,5 +1,3 @@
-#include "gw_fftw.h"
-#include "callfftw.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
@@ -8,10 +6,19 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "callfftw.h"
 #include "Scierror.h"
 #include "sciprint.h"
 #include "MALLOC.h"
 #include "fftwlibname.h"
+#include "gw_fftw.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/ 
+typedef int (*fftw_interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct {
+       fftw_interf f;    /** function **/
+       char *name;      /** its name **/
+} intFFTWTable;
 /*-----------------------------------------------------------------------------------*/ 
 static intFFTWTable Tab[]={
 { sci_loadfftwlibrary,"loadfftwlibrary"},
index dc04e03..c058c69 100644 (file)
@@ -4,14 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __INTFILEIO__
 #define __INTFILEIO__
-
-#ifdef _MSC_VER
-       #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_fileio)(void);
+/*-----------------------------------------------------------------------------------*/ 
 int intsmeof __PARAMS((char *fname,unsigned long fname_len));
 int intsmopen __PARAMS((char *fname,unsigned long fname_len));
 int intsmputstr __PARAMS((char *fname,unsigned long fname_len));
@@ -37,9 +34,6 @@ int int_objprintf __PARAMS((char *fname,unsigned long fname_len));
 int intsmopen __PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_xls_read) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_xls_open) _PARAMS((char *fname,unsigned long fname_len));
-
-
-int C2F(gw_fileio)(void);
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __INTFILEIO__ */
 /*-----------------------------------------------------------------------------------*/
index ade23ab..1250bcd 100644 (file)
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __INTGRAPHICS__
 #define __INTGRAPHICS__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*des_interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct {
-       des_interf f;    /** function **/
-       char *name;      /** its name **/
-} MatdesTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_graphics)(void);
-
 /*-----------------------------------------------------------------------------------*/ 
-extern int sci_champ                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_param3d                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_plot3d                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_plot2d                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_plot2d1_1                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_plot2d1_2                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_plot2d1_3                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_plot2d1_4                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_grayplot                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_driver                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xarc                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xarcs                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xrects                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xarrows                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xsegs                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_drawaxis                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xchange                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xclea                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xrect                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xclear                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xclick                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xend                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xfpoly                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xfpolys                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xget                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xinit                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xlfont                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xpoly                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xpolys                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_show_window                _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xset                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xstring                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xstringl                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_StringBox                  _PARAMS((char *fname, unsigned long fname_len)) ;
-extern int sci_xtape                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xsetech                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xgetech                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_geom3d                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_fec                        _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xgetmouse                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xtitle                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xgrid                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xfarcs                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_champ1                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xdel                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xg2ps                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xs2ps                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xs2fig                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xsort                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_winsid                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_param3d1                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xstringb                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_matplot                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_contour2di                 _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_matplot1                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xgraduate                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xname                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xaxis                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_help_gtk                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_set                        _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_get                        _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_delete                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_addcb                      _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_copy                       _PARAMS((char *fname, unsigned long subwinparenttarget));
-extern int sci_move                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_glue                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_unglue                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_drawnow                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_drawlater                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_draw                       _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xs2gif                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xs2ppm                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_set_posfig_dim             _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xsnative                   _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_zoom_rect                  _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_unzoom                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xs2bmp                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_xs2emf                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_UImenu                     _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_newaxes                    _PARAMS((char *fname, unsigned long fname_len));
-extern int sci_showalluimenushandles      _PARAMS(( char * fname, unsigned long fname_len ) ) ;
-extern int sci_relocate_handle            _PARAMS(( char * fname, unsigned long fname_len ) ) ;
-extern int sci_swap_handles               _PARAMS(( char * fname, unsigned long fname_len ) ) ;
-extern int sci_readxbm                   _PARAMS(( char * fname, unsigned long fname_len ) ) ;
-extern int sci_readgif                   _PARAMS(( char * fname, unsigned long fname_len ) ) ;
-
-
+int sci_champ                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_param3d                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_plot3d                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_plot2d                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_plot2d1_1                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_plot2d1_2                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_plot2d1_3                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_plot2d1_4                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_grayplot                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_driver                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xarc                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_xarcs                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xrects                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xarrows                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_xsegs                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_drawaxis                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_xchange                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_xclea                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xrect                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xclear                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xclick                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xend                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_xfpoly                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xfpolys                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_xget                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_xinit                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xlfont                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xpoly                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xpolys                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_show_window                _PARAMS((char *fname, unsigned long fname_len));
+int sci_xset                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_xstring                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_xstringl                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_StringBox                  _PARAMS((char *fname, unsigned long fname_len)) ;
+int sci_xtape                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xsetech                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_xgetech                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_geom3d                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_fec                        _PARAMS((char *fname, unsigned long fname_len));
+int sci_xgetmouse                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_xtitle                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xgrid                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xfarcs                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_champ1                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xdel                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_xg2ps                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xs2ps                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xs2fig                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xsort                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_winsid                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_param3d1                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_xstringb                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_matplot                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_contour2di                 _PARAMS((char *fname, unsigned long fname_len));
+int sci_matplot1                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_xgraduate                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_xname                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_xaxis                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_help_gtk                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_set                        _PARAMS((char *fname, unsigned long fname_len));
+int sci_get                        _PARAMS((char *fname, unsigned long fname_len));
+int sci_delete                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_addcb                      _PARAMS((char *fname, unsigned long fname_len));
+int sci_copy                       _PARAMS((char *fname, unsigned long subwinparenttarget));
+int sci_move                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_glue                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_unglue                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_drawnow                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_drawlater                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_draw                       _PARAMS((char *fname, unsigned long fname_len));
+int sci_xs2gif                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xs2ppm                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_set_posfig_dim             _PARAMS((char *fname, unsigned long fname_len));
+int sci_xsnative                   _PARAMS((char *fname, unsigned long fname_len));
+int sci_zoom_rect                  _PARAMS((char *fname, unsigned long fname_len));
+int sci_unzoom                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xs2bmp                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_xs2emf                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_UImenu                     _PARAMS((char *fname, unsigned long fname_len));
+int sci_newaxes                    _PARAMS((char *fname, unsigned long fname_len));
+int sci_showalluimenushandles      _PARAMS(( char * fname, unsigned long fname_len ) ) ;
+int sci_relocate_handle            _PARAMS(( char * fname, unsigned long fname_len ) ) ;
+int sci_swap_handles               _PARAMS(( char * fname, unsigned long fname_len ) ) ;
+int sci_readxbm                          _PARAMS(( char * fname, unsigned long fname_len ) ) ;
+int sci_readgif                          _PARAMS(( char * fname, unsigned long fname_len ) ) ;
+/*-----------------------------------------------------------------------------------*/ 
 #endif /* __INTGRAPHICS__ */
 /*-----------------------------------------------------------------------------------*/ 
index b5ac5dd..62fdbd7 100644 (file)
@@ -2,15 +2,23 @@
 /* INRIA 2005 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
-#include "gw_graphics.h"
-#include "graphicModuleLoad.h"
 #include <string.h>
 #ifdef _MSC_VER
+#include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_graphics.h"
+#include "stack-c.h"
+#include "graphicModuleLoad.h"
 /*-----------------------------------------------------------------------------------*/ 
 extern int GetWITH_GUI(void);
 /*-----------------------------------------------------------------------------------*/ 
+typedef int (*des_interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct {
+       des_interf f;    /** function **/
+       char *name;      /** its name **/
+} MatdesTable;
+/*-----------------------------------------------------------------------------------*/ 
 static MatdesTable Tab[]={
        {sci_champ,"champ"},    
        {sci_champ1,"champ1"},
index 68f9262..1ca1688 100644 (file)
@@ -15,7 +15,7 @@
 #include "DefaultCommandArg.h"
 #include "Champ.h"
 #include "GetProperty.h"
-
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 int sci_champ (char *fname,unsigned long fname_len)
 {
index cb92e60..3db0eeb 100644 (file)
@@ -17,6 +17,7 @@
 #include "sciCall.h"
 #include "GetProperty.h"
 #include "DefaultCommandArg.h"
+#include "sciprint.h"
 
 /*-----------------------------------------------------------------------------------*/
 int sci_fec(char *fname,unsigned long fname_len)
index f88624e..d795398 100644 (file)
@@ -14,6 +14,7 @@
 #include "GetProperty.h"
 #include "axesScale.h"
 #include "CurrentObjectsManagement.h"
+#include "sciprint.h"
 
 int geom3d(double *x, double *y, double *z, integer *n) ;
 
index 32640a4..a3b70f0 100644 (file)
@@ -14,7 +14,7 @@
 #include "GetProperty.h"
 #include "DefaultCommandArg.h"
 #include "sciCall.h"
-
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 int sci_grayplot( char *fname, unsigned long fname_len )
 {
index df43281..1fbf1c0 100644 (file)
@@ -14,7 +14,7 @@
 #include "DestroyObjects.h"
 #include "GetProperty.h"
 #include "sciCall.h"
-
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 int sci_matplot(char *fname,unsigned long fname_len)
 {
index b62eb66..ca7ab41 100644 (file)
@@ -13,7 +13,7 @@
 #include "DestroyObjects.h"
 #include "GetProperty.h"
 #include "sciCall.h"
-
+#include "sciprint.h"
 /*------------------------------------------------------------------------*/
 int sci_param3d( char * fname, unsigned long fname_len )
 {
index 8a929e9..b2f1f19 100644 (file)
@@ -13,7 +13,7 @@
 #include "GetProperty.h"
 #include "sciCall.h"
 #include "MALLOC.h"
-
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 int sci_param3d1( char *fname, unsigned long fname_len )
 {
index 8e7746e..c89bd8c 100644 (file)
@@ -19,7 +19,7 @@
 #include "sciCall.h"
 #include "DefaultCommandArg.h"
 #include "sci_plot2d.h"
-
+#include "sciprint.h"
 /*------------------------------------------------------------------------*/
 int sci_plot2d( char * fname, unsigned long fname_len )
 {
index 2909b1a..43fd4bf 100644 (file)
@@ -15,6 +15,7 @@
 #include "DefaultCommandArg.h"
 #include "GetProperty.h"
 #include "sciCall.h"
+#include "sciprint.h"
 
 /*-----------------------------------------------------------------------------------*/
 int sci_plot2d1_1 (char *fname,unsigned long fname_len)
index d690efe..db52f0f 100644 (file)
@@ -18,6 +18,7 @@
 #include "DestroyObjects.h"
 #include "MALLOC.h"
 #include "sciCall.h"
+#include "sciprint.h"
 
 /*-----------------------------------------------------------------------------------*/
 int sci_plot3d( char * fname, unsigned long fname_len )
index 9da3345..fd328c7 100644 (file)
@@ -21,7 +21,7 @@
 #include "XsetXgetParameters.h"
 #include "periScreen.h"
 #include "CurrentObjectsManagement.h"
-
+#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 int sci_xset( char *fname, unsigned long fname_len )
 {
index 0b5d809..3438a83 100644 (file)
@@ -4,28 +4,10 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_GUI__
 #define __GW_GUI__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Gui_Interf) __PARAMS((char *fname,unsigned long l));
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_gui)(void);
-
-typedef struct table_struct 
-{
-  Gui_Interf f;    /** function **/
-  char *name;      /** its name **/
-} GuiTable;
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_x_dialog) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_x_message) _PARAMS((char *fname,unsigned long fname_len));
@@ -42,7 +24,7 @@ int sci_clc( char *fname, unsigned long fname_len ) ;
 int sci_raise_window( char * fname, unsigned long fname_len ) ;
 int sci_tohome( char * fname, unsigned long fname_len ) ;
 BOOL GetWITH_GUI(void);
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_GUI__ */
 /*-----------------------------------------------------------------------------------*/
 
index f0bc31d..0d75045 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_gui.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_gui.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Gui_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Gui_Interf f;    /** function **/
+       char *name;      /** its name **/
+} GuiTable;
 /*-----------------------------------------------------------------------------------*/
 static GuiTable Tab[]=
 {
index 5354e7d..e03cf2d 100644 (file)
@@ -4,29 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_INTEGER__
 #define __GW_INTEGER__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_integer)(void);
-
-typedef int (*Integer_Interf) __PARAMS((char *fname,unsigned long fname_len));
-
-typedef struct table_struct 
-{
-  Integer_Interf f;    /** function **/
-  char *name;      /** its name **/
-} IntegerTable;
-
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sciint32) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciint16) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciint8) _PARAMS((char *fname,unsigned long fname_len));
@@ -53,7 +35,7 @@ int C2F(sciiconvert) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciimatrix) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciiprod) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciicumprod) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_INTEGER__ */
 /*-----------------------------------------------------------------------------------*/
 
index afbc8c4..abe6acd 100644 (file)
@@ -2,11 +2,20 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-#include "gw_integer.h"
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_integer.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Integer_Interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct 
+{
+       Integer_Interf f;    /** function **/
+       char *name;      /** its name **/
+} IntegerTable;
 /*-----------------------------------------------------------------------------------*/
 static int C2F(scivoid) _PARAMS((char *fname,unsigned long fname_len))
 {
index 9115048..e4d5dc8 100644 (file)
@@ -1,16 +1,13 @@
 /*-----------------------------------------------------------------------------------*/
 /* INRIA */
 /*-----------------------------------------------------------------------------------*/
-#include "MALLOC.h"
-#include "stack-c.h"
-#include "sciprint.h"
+#ifndef  __GW_INTERPOLATION_H__
+#define __GW_INTERPOLATION_H__
 /*-----------------------------------------------------------------------------------*/
-#ifdef _MSC_VER
-#include <string.h>
-#endif
+#include "machine.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_interpolation)(void);
-
+/*-----------------------------------------------------------------------------------*/
 int intsplin(char *fname,unsigned long fname_len); 
 int intlsq_splin(char *fname,unsigned long fname_len);
 int intinterp1(char *fname,unsigned long fname_len); 
@@ -22,3 +19,7 @@ int inteval_cshep2d(char *fname,unsigned long fname_len);
 int intsplin3d(char *fname,unsigned long fname_len); 
 int intinterp3d(char *fname,unsigned long fname_len); 
 int intbsplin3val(char *fname,unsigned long fname_len) ;
+/*-----------------------------------------------------------------------------------*/
+#endif /* __GW_INTERPOLATION_H__ */
+/*-----------------------------------------------------------------------------------*/
+
index 96d39c0..4ea98c5 100644 (file)
@@ -1,11 +1,14 @@
 /*-----------------------------------------------------------------------------------*/
 /* INRIA */
 /*-----------------------------------------------------------------------------------*/ 
-#include "gw_interpolation.h"
-/*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
+#include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_interpolation.h"
+#include "MALLOC.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
 static TabF Tab[]={ 
   {intsplin,           "splin"},
index 512dd57..6e0f7f0 100644 (file)
@@ -4,26 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_IO__
 #define __GW_IO__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_io)(void);
-
-typedef int (*Io_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Io_Interf f;    /** function **/
-  char *name;      /** its name **/
-} IoTable;
+/*-----------------------------------------------------------------------------------*/
 int C2F(sci_oldload) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_read) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_getf) _PARAMS((char *fname,unsigned long fname_len));
@@ -61,7 +46,7 @@ int C2F(intdisp)();
 int C2F(intexec)();
 int C2F(sci_getrelativefilename) _PARAMS((char *fname,unsigned long l));
 int C2F(sci_newest) _PARAMS((char *fname,unsigned long l));
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_IO__ */
 /*-----------------------------------------------------------------------------------*/
 
index b848b40..aee90d9 100644 (file)
@@ -7,8 +7,15 @@
 #include "ExceptionMessage.h"
 #endif
 #include "gw_io.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Io_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Io_Interf f;    /** function **/
+       char *name;      /** its name **/
+} IoTable;
 /*-----------------------------------------------------------------------------------*/
-
 static IoTable Tab[]=
 {
 {C2F(sci_oldload),"oldload"},
index 46a8485..8f71825 100644 (file)
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include "gw_io.h"
 #include "sci_diary.h"
+#include "stack-c.h"
 #include "../../fileio/src/c/files.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(intdiary)();
index 3e5703a..ec3b15c 100644 (file)
@@ -9,6 +9,7 @@
 #include "gw_io.h"
 #include "MALLOC.h"
 #include "sciprint.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
 extern int C2F(cluni0)(char *in_name, char *out_name, int *out_n, long int lin, long int lout);
 /*-----------------------------------------------------------------------------------*/
index a4b34e0..1d47a57 100644 (file)
@@ -2,9 +2,12 @@
 #include "machine.h"
 
 #include <stdlib.h>
-#ifndef _MSC_VER
-#include <sys/types.h>
-#include <unistd.h>
+#ifdef _MSC_VER
+       #include <process.h>
+       #define getpid _getpid
+#else
+       #include <sys/types.h>
+       #include <unistd.h>
 #endif
 #include "getpidc.h"
 
index e158876..6cca5db 100644 (file)
@@ -2,10 +2,16 @@
 /* INRIA 2007 */
 /* Sylvestre LEDRU */
 /*-----------------------------------------------------------------------------------*/
+#ifndef __GETPIDC_H__
+#define __GETPIDC_H__
 
+#include "machine.h"
 /**
- * Retrieve the pid (process id)
- * @param[out] id1 the id of the process
- */
+* Retrieve the pid (process id)
+* @param[out] id1 the id of the process
+*/
 int C2F(getpidc)(int *id1);
 
+
+#endif /* __GETPIDC_H__ */
+
index 21e7e30..146d024 100644 (file)
@@ -7,34 +7,34 @@
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
-                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmtd.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremdd.lib /DLL libmmdd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/io_f.pdb" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n io_f.dll %%f &gt;nul
 copy *.def io_f.def &gt;nul
 copy io_f.def ..\io_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
+copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
-                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" UseProcessorExtensions="codeForStreamingSIMD" RequireProcessorExtensions="codeExclusivelyStreamingSIMD" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLinkerTool" MustRebuild="true" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n io_f.dll %%f &gt;nul
 copy *.def io_f.def &gt;nul
 copy io_f.def ..\io_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
+copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="..\..\sci_gateway\fortran\intdeff.f"/>
index 47ef273..ccd6bbd 100644 (file)
@@ -4,14 +4,7 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_LINEAR_ALGEBRA__
 #define __GW_LINEAR_ALGEBRA__
-
-
-#include <string.h>
-
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
 /*-----------------------------------------------------------------------------------*/
 #define SCI_DOUBLE 1
 #define STRING  10
 #define STRINGCOMPLEX 12
 #define YES 1
 #define NO 0
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_linear_algebra)(void);
-
-
-typedef int (*Linear_Algebra_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       Linear_Algebra_Interf f;    /** function **/
-       char *name;      /** its name **/
-} LinearAlgebraTable;
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(inthess)(char *fname,unsigned long fname_len);
 int C2F(intqr)(char *fname,unsigned long fname_len);
 int C2F(intbackslash)(char *fname,unsigned long fname_len);
@@ -50,7 +33,7 @@ int C2F(intchol)(char *fname,unsigned long fname_len);
 int C2F(inteig) (char *fname,unsigned long fname_len);
 int C2F(intbalanc)(char *fname,unsigned long fname_len);
 int C2F(intschur)(char *fname, unsigned long fname_len);
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_LINEAR_ALGEBRA__ */
 /*-----------------------------------------------------------------------------------*/
 
index 81102e8..99cdcfc 100644 (file)
@@ -4,26 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_LINEAR_ALGEBRA2__
 #define __GW_LINEAR_ALGEBRA2__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Linear_Algebra2_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct2
-{
-       Linear_Algebra2_Interf f;    /** function **/
-       char *name;      /** its name **/
-} LinearAlgebra2Table;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_linear_algebra2)(void);
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_LINEAR_ALGEBRA2__ */
 /*-----------------------------------------------------------------------------------*/
 
index 5baafc9..9b6b73d 100644 (file)
@@ -2,11 +2,21 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
+#include <string.h>
 #ifdef _MSC_VER
+#include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "stack-c.h"
 #include "gw_linear_algebra.h"
 /*-----------------------------------------------------------------------------------*/ 
+typedef int (*Linear_Algebra_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Linear_Algebra_Interf f;    /** function **/
+       char *name;      /** its name **/
+} LinearAlgebraTable;
+/*-----------------------------------------------------------------------------------*/ 
 static int C2F(intvoid) _PARAMS((char *fname, unsigned long fname_len))
 {
        return 0;
index 9733904..bfc23c5 100644 (file)
@@ -1,15 +1,22 @@
-#include "gw_linear_algebra2.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
 #include "gw_linear_algebra.h"
+#include "gw_linear_algebra2.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/ 
-int C2F(gw_linear_algebra2)(void);
+typedef int (*Linear_Algebra2_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct2
+{
+       Linear_Algebra2_Interf f;    /** function **/
+       char *name;      /** its name **/
+} LinearAlgebra2Table;
 /*-----------------------------------------------------------------------------------*/ 
 static LinearAlgebra2Table Tab[]={
        {C2F(intqr),"qr"},
index fc12d38..49b20da 100644 (file)
                        Name="Header Files"
                        Filter="h;hpp;hxx;hm;inl"
                        >
+                       <File
+                               RelativePath="..\..\includes\gw_linear_algebra.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\includes\gw_linear_algebra2.h"
+                               >
+                       </File>
                </Filter>
                <File
                        RelativePath="..\..\sci_gateway\linear_algebra"
index 7e4fcde..79b4c7a 100644 (file)
@@ -7,34 +7,34 @@
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)linear_algebra_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linear_algebra.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
-                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmtd.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremdd.lib /DLL libmmdd.lib /DLL linear_algebra.lib" OutputFile="$(SolutionDir)bin\linear_algebra_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linear_algebra_f.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/linear_algebra_f.pdb" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\linear_algebra_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n linear_algebra_f.dll %%f &gt;nul
 copy *.def linear_algebra_f.def &gt;nul
 copy linear_algebra_f.def ..\linear_algebra_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy linear_algebra_f_header.def+linear_algebra_f.vcdef linear_algebra_f.def &gt;nul" Description="Build linear_algebra.def"/></Configuration>
+copy linear_algebra_f_header.def+linear_algebra_f.vcdef linear_algebra_f.def &gt;nul" Description="Build linear_algebra.def"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)linear_algebra_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linear_algebra.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
-                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" UseProcessorExtensions="codeForStreamingSIMD" RequireProcessorExtensions="codeExclusivelyStreamingSIMD" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" UseProcessorExtensions="codeForStreamingSIMD" RequireProcessorExtensions="codeExclusivelyStreamingSIMD" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLinkerTool" MustRebuild="true" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL linear_algebra.lib" OutputFile="$(SolutionDir)bin\linear_algebra_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linear_algebra_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\linear_algebra_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
+                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL linear_algebra.lib" OutputFile="$(SolutionDir)bin\linear_algebra_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linear_algebra_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\linear_algebra_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n linear_algebra_f.dll %%f &gt;nul
 copy *.def linear_algebra_f.def &gt;nul
 copy linear_algebra_f.def ..\linear_algebra_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy linear_algebra_f_header.def+linear_algebra_f.vcdef linear_algebra_f.def &gt;nul" Description="Build linear_algebra.def"/></Configuration></Configurations>
+copy linear_algebra_f_header.def+linear_algebra_f.vcdef linear_algebra_f.def &gt;nul" Description="Build linear_algebra.def"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="..\..\sci_gateway\fortran\bschur.f"/>
index d80bfdf..729e83f 100644 (file)
@@ -4,17 +4,10 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_LOCALIZATION__
 #define __GW_LOCALIZATION__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
 #include "machine.h"
-#include "stack-c.h"
-
-typedef int (*localization_interf) __PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_localization)(void);
+/*-----------------------------------------------------------------------------------*/ 
 /* interface for the previous function Table */ 
 /*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_setlanguage) _PARAMS((char *fname,unsigned long fname_len));
@@ -24,14 +17,7 @@ int C2F(sci_getlanguagestable) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_gettext) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_addtext) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_removetext) _PARAMS((char *fname,unsigned long fname_len));
-
-int C2F(gw_localization)(void);
-
-typedef struct table_struct {
-       localization_interf f;    /** function **/
-       char *name;      /** its name **/
-} LocalizationTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_LOCALIZATION__ */
 /*-----------------------------------------------------------------------------------*/
 
index 21e0dad..f2fd855 100644 (file)
@@ -2,12 +2,20 @@
 /* INRIA 2005 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-#include "gw_localization.h"
+#include <string.h>
 #if _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-#include "sciprint.h"
+#include "gw_localization.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/ 
+typedef int (*localization_interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct 
+{
+       localization_interf f;    /** function **/
+       char *name;      /** its name **/
+} LocalizationTable;
 /*-----------------------------------------------------------------------------------*/
 static LocalizationTable Tab[]=
 {
index 3180529..757e362 100644 (file)
@@ -4,28 +4,10 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_METANET__
 #define __GW_METANET__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_metanet)(void);
-
-typedef int (*Metanet_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Metanet_Interf f;    /** function **/
-  char *name;      /** its name **/
-} MetanetTable;
-
 /*-----------------------------------------------------------------------------------*/
 int C2F(intsm6loadg) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(intsm6saveg) _PARAMS((char *fname,unsigned long fname_len));
@@ -77,7 +59,7 @@ int C2F(intsm6deumesh) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(intsm6bandred) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(intsm6meshmesh) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(intsm6ford) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_METANET__ */
 /*-----------------------------------------------------------------------------------*/
 
index d89fc4c..577fba9 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_metanet.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_metanet.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Metanet_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Metanet_Interf f;    /** function **/
+       char *name;      /** its name **/
+} MetanetTable;
 /*-----------------------------------------------------------------------------------*/
 static MetanetTable Tab[]=
 {
index ff8031a..f8e5aff 100644 (file)
@@ -9,7 +9,6 @@ extern "C" {
 #ifndef SCI_MEX 
 #define SCI_MEX 
 
-
 #ifdef WIN32
        #include <stddef.h> /*for LCC */
 #endif
@@ -27,18 +26,20 @@ typedef int (*GatefuncH) __PARAMS((int nlhs,mxArray *plhs[],int nrhs,
 typedef int (*FGatefuncH) __PARAMS((int *nlhs,mxArray *plhs[],int *nrhs,
                                  mxArray *prhs[]));
 
-typedef int Gatefunc __PARAMS((int nlhs,mxArray *plhs[],int nrhs,
-                                 mxArray *prhs[]));
+typedef int Gatefunc __PARAMS((int nlhs,mxArray *plhs[],int nrhs,mxArray *prhs[]));
 typedef int (*GatefuncS) __PARAMS((char *fname, int l));
 typedef int (*Myinterfun) __PARAMS((char *, GatefuncH F));
 
 typedef int (*GT) ();
 
+#ifndef __DEF_TABLE_STRUCT__
+#define __DEF_TABLE_STRUCT__
 typedef struct table_struct {
-  Myinterfun f;    /** interface **/
-  GT F;     /** function **/
-  char *name;      /** its name **/
+       Myinterfun f;    /** interface **/
+       GT F;     /** function **/
+       char *name;      /** its name **/
 } GenericTable;
+#endif
 
 #define mxLOGICAL int
 #define mxLogical int
@@ -109,7 +110,7 @@ extern int getdiary __PARAMS(());
 
 void clear_mex(integer nlhs, mxArray **plhs, integer nrhs, mxArray **prhs);
 
-extern void errjump __PARAMS((void));
+extern void errjump __PARAMS((int n));
 int  C2F(mxgetm)  __PARAMS((mxArray *ptr));
 int  C2F(mxgetn)  __PARAMS((mxArray *ptr));
 int  C2F(mxgetstring)  __PARAMS((mxArray *ptr, char *str, int *strl));
index 7bea378..723c8b1 100644 (file)
@@ -904,7 +904,7 @@ void *mxGetImagData(const mxArray *ptr)
 void mexErrMsgTxt(char *error_msg)
 {
   cerro(error_msg);
-  errjump();
+  errjump(0);
 }
 
 void mxAssert(int expr, char *error_message)
@@ -2199,7 +2199,7 @@ int mexEvalString(char *name)
   mxFreeMatrix(ppr[0]);
   if ( rep == 1 || (int) (*val) != 0 )
     {
-      errjump();
+      errjump(0);
     }
   return rep;
 }
@@ -2740,7 +2740,7 @@ void  C2F(mexprintf)(char *error_msg, int len)
 void C2F(mexerrmsgtxt)(char *error_msg, int len)
 {
   C2F(erro)(error_msg,len);
-  errjump();
+  errjump(0);
 }
 
 mxArray *C2F(mxcreatefull)(int *m, int *n, int *it)
index 3755528..6de1ba1 100644 (file)
@@ -4,28 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_OPTIM__
 #define __GW_OPTIM__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_optim)(void);
-
-typedef int (*Optim_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Optim_Interf f;    /** function **/
-  char *name;      /** its name **/
-} OptimTable;
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(sci_optim) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_semidef) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_fsolve) _PARAMS((char *fname,unsigned long fname_len));
@@ -33,13 +16,12 @@ int C2F(sci_sqrsolve) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_qld) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciquapro) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_quapro) _PARAMS((char *fname,unsigned long fname_len));
-
 int C2F(intqld)_PARAMS((char *fname,unsigned long fname_len));
 int C2F(intlsqrsolve) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(scioptim) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(scisolv)  _PARAMS((char *fname,unsigned long fname_len));
 int C2F(scisemidef)_PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_OPTIM__ */
 /*-----------------------------------------------------------------------------------*/
 
index 781419b..bcc8ba2 100644 (file)
@@ -2,10 +2,20 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
+#include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
 #include "gw_optim.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Optim_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Optim_Interf f;    /** function **/
+       char *name;      /** its name **/
+} OptimTable;
 /*-----------------------------------------------------------------------------------*/
 static OptimTable Tab[]=
 {
index de1424e..6b92a39 100644 (file)
@@ -4,26 +4,29 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_POLYNOMIALS__
 #define __GW_POLYNOMIALS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Polynomials_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Polynomials_Interf f;    /** function **/
-  char *name;      /** its name **/
-} PolynomialsTable;
-
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_polynomials)(void);
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_poly) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_roots) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_degree) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_coeff) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_eval) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_pppdiv) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_simp) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_psum) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_pprod) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_pdiag) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_ptriu) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_ptril) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_bezout) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_sfact) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_simp_mode) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_varn) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_cleanp) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_POLYNOMIALS__ */
 /*-----------------------------------------------------------------------------------*/
 
index f4e767c..6fb6b92 100644 (file)
@@ -1,4 +1,4 @@
-#include "gw_polynomials.h"
+
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
@@ -7,26 +7,15 @@
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_polynomials.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-extern int C2F(sci_poly) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_roots) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_degree) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_coeff) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_eval) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_pppdiv) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_simp) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_psum) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_pprod) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_pdiag) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_ptriu) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_ptril) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_bezout) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_sfact) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_simp_mode) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_varn) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_cleanp) _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/
-int C2F(gw_polynomials)(void);
+typedef int (*Polynomials_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Polynomials_Interf f;    /** function **/
+       char *name;      /** its name **/
+} PolynomialsTable;
 /*-----------------------------------------------------------------------------------*/
 static PolynomialsTable Tab[]=
 {
index 442219e..d982c04 100644 (file)
@@ -4,33 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __INTMATPVM__
 #define __INTMATPVM__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_pvm)(void);
-/*
-typedef int mxArray;
-typedef int (*GatefuncS) __PARAMS((char *fname, int l)); 
-typedef int Gatefunc __PARAMS((int nlhs,mxArray *plhs[],int nrhs,mxArray *prhs[]));
-typedef int (*FGatefuncH) __PARAMS((int *nlhs,mxArray *plhs[],int *nrhs,mxArray *prhs[]));
-typedef int (*GT) ();
-typedef int (*GatefuncH) __PARAMS((int nlhs,mxArray *plhs[],int nrhs, mxArray *prhs[]));
-typedef int (*Myinterfun) __PARAMS((char *, GatefuncH F));
-*/
-typedef int (*PVM_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct {
-  PVM_Interf f;     /** function **/
-  char *name;      /** its name **/
-} PVMTable;
-
-
+/*-----------------------------------------------------------------------------------*/ 
 int intspvm_addhosts _PARAMS((char *fname,unsigned long fname_len));
 int intspvm_barrier _PARAMS((char *fname,unsigned long fname_len));
 int intspvm_bcast _PARAMS((char *fname,unsigned long fname_len));
@@ -64,7 +42,6 @@ int intspvm_spawn_independent _PARAMS((char *fname,unsigned long fname_len));
 int intspvm_start _PARAMS((char *fname,unsigned long fname_len));
 int intspvm_tasks _PARAMS((char *fname,unsigned long fname_len));
 int intspvm_tidtohost _PARAMS((char *fname,unsigned long fname_len));
-
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __INTMATPVM__ */
 /*-----------------------------------------------------------------------------------*/
index 6b0d48a..df88518 100644 (file)
@@ -1,12 +1,20 @@
-#include "gw_pvm.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
   #include <Windows.h>
   #include "ExceptionMessage.h"
 #endif
+#include "gw_pvm.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*PVM_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct {
+       PVM_Interf f;     /** function **/
+       char *name;      /** its name **/
+} PVMTable;
 /*-----------------------------------------------------------------------------------*/
   static PVMTable Tab[]={
   {intspvm_joingroup,"pvm_joingroup"},
diff --git a/scilab/modules/randlib/includes/gw_randlib.h b/scilab/modules/randlib/includes/gw_randlib.h
new file mode 100644 (file)
index 0000000..1a29cc1
--- /dev/null
@@ -0,0 +1,15 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2006 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#ifndef __GW_RANDLIB_H__\r
+#define __GW_RANDLIB_H__\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include "machine.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(gw_randlib)(void);\r
+/*-----------------------------------------------------------------------------------*/ \r
+int sci_Rand(char *fname,unsigned long fname_len);\r
+/*-----------------------------------------------------------------------------------*/ \r
+#endif /* __GW_RANDLIB_H__ */\r
+/*-----------------------------------------------------------------------------------*/\r
index c83d544..9101f6f 100644 (file)
@@ -2,18 +2,16 @@
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-
+#include "gw_randlib.h"
 #include "stack-c.h"
-#include "sciprint.h"
-/*-----------------------------------------------------------------------------------*/
-extern int RandI(char *fname,unsigned long fname_len);
 /*-----------------------------------------------------------------------------------*/
 static TabF Tab[]={ 
-       {RandI, "Rand"},
+       {sci_Rand, "Rand"},
 };
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_randlib)(void)
index 3b8901e..d1ea7fc 100644 (file)
@@ -113,7 +113,7 @@ double C2F(ignuin)(double *a, double *b)
  *  hand written interface for the randlib 
  ***********************************************************************/
 
-int RandI(char *fname,unsigned long fname_len)
+int sci_Rand(char *fname,unsigned long fname_len)
 { 
   int minrhs = 1,maxrhs = 10,minlhs=1,maxlhs=2;
   int ResL,ResC,suite,m2,n2,l2,m1,n1,l1,ls,ms,ns,la,lr,lb,lc;
index e5cfd5f..c399687 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\gw_randlib.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\includes\others_generators.h"
                                >
                        </File>
index 68ad1e4..ddf8b20 100644 (file)
@@ -7,34 +7,34 @@
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)randlib_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)randlib.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
-                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmtd.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremdd.lib /DLL libmmdd.lib /DLL randlib.lib" OutputFile="$(SolutionDir)bin\randlib_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="randlib_f.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/randlib_f.pdb" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\randlib_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n randlib_f.dll %%f &gt;nul
 copy *.def randlib_f.def &gt;nul
 copy randlib_f.def ..\randlib_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy randlib_f_header.def+randlib_f.vcdef randlib_f.def &gt;nul" Description="Build randlib.def"/></Configuration>
+copy randlib_f_header.def+randlib_f.vcdef randlib_f.def &gt;nul" Description="Build randlib.def"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)randlib_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)randlib.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
-                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" UseProcessorExtensions="codeForStreamingSIMD" RequireProcessorExtensions="codeExclusivelyStreamingSIMD" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" UseProcessorExtensions="codeForStreamingSIMD" RequireProcessorExtensions="codeExclusivelyStreamingSIMD" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLinkerTool" MustRebuild="true" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL randlib.lib" OutputFile="$(SolutionDir)bin\randlib_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="randlib_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\randlib_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
+                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL randlib.lib" OutputFile="$(SolutionDir)bin\randlib_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="randlib_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\randlib_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
                                <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n randlib_f.dll %%f &gt;nul
 copy *.def randlib_f.def &gt;nul
 copy randlib_f.def ..\randlib_f.vcdef &gt;nul
 rem del *.def &gt;nul
 cd ..
-copy randlib_f_header.def+randlib_f.vcdef randlib_f.def &gt;nul" Description="Build randlib.def"/></Configuration></Configurations>
+copy randlib_f_header.def+randlib_f.vcdef randlib_f.def &gt;nul" Description="Build randlib.def"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath=".\genbet.f"/>
index 8f73d2e..6c369ca 100644 (file)
@@ -4,22 +4,27 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_CSCICOS__
 #define __GW_CSCICOS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*scicosc_interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct {
-  scicosc_interf f;    /** function **/
-  char *name;      /** its name **/
-} intcscicosTable;
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_cscicos)(void);
+/*-----------------------------------------------------------------------------------*/
+/* interface for the previous function Table */ 
+/*-----------------------------------------------------------------------------------*/ 
+int inttimescicos _PARAMS((char *fname,unsigned long l));
+int intduplicate _PARAMS((char *fname,unsigned long l));
+int intdiffobjs _PARAMS((char *fname,unsigned long l));
+int intxproperty _PARAMS((char *fname,unsigned long l));
+int intphasesim _PARAMS((char *fname,unsigned long l));
+int intsetxproperty _PARAMS((char *fname,unsigned long l));
+int intcpass2 _PARAMS((char *fname,unsigned long l));
+int intsetblockerror _PARAMS((char *fname,unsigned long l));
+int inttree2 _PARAMS((char *fname,unsigned long l));
+int inttree3 _PARAMS((char *fname,unsigned long l));
+int inttree4 _PARAMS((char *fname,unsigned long l));
+int intscicosimc _PARAMS((char *fname, unsigned long l));
+int intgetscicosvarsc _PARAMS((char *fname, unsigned long l));
+int intcurblkc _PARAMS((char *fname, unsigned long l));
+int intbuildouttb _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_CSCICOS__ */
 /*-----------------------------------------------------------------------------------*/
index 51fe74d..c97521e 100644 (file)
@@ -4,22 +4,23 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SCICOS__
 #define __GW_SCICOS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*scicos_interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct {
-  scicos_interf f;    /** function **/
-  char *name;      /** its name **/
-} intscicosTable;
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_scicos)(void);
+/*-----------------------------------------------------------------------------------*/
+/* interface for the previous function Table */ 
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(sci_var2vec) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_vec2var) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_curblock) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_getblocklabel) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_scicos_debug) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_scicos_debug_count) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_sctree) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_sci_tree2) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_sci_tree3) _PARAMS((char *fname,unsigned long fname_len));
+int C2F(sci_sci_tree4) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_SCICOS__ */
 /*-----------------------------------------------------------------------------------*/
index fc70dac..ffc8bc5 100644 (file)
@@ -1,30 +1,20 @@
-#include "gw_cscicos.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2005 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-/*-----------------------------------------------------------------------------------*/
-/* interface for the previous function Table */ 
+#include "gw_cscicos.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/ 
-extern int inttimescicos _PARAMS((char *fname,unsigned long l));
-extern int intduplicate _PARAMS((char *fname,unsigned long l));
-extern int intdiffobjs _PARAMS((char *fname,unsigned long l));
-extern int intxproperty _PARAMS((char *fname,unsigned long l));
-extern int intphasesim _PARAMS((char *fname,unsigned long l));
-extern int intsetxproperty _PARAMS((char *fname,unsigned long l));
-extern int intcpass2 _PARAMS((char *fname,unsigned long l));
-extern int intsetblockerror _PARAMS((char *fname,unsigned long l));
-extern int inttree2 _PARAMS((char *fname,unsigned long l));
-extern int inttree3 _PARAMS((char *fname,unsigned long l));
-extern int inttree4 _PARAMS((char *fname,unsigned long l));
-extern int intscicosimc _PARAMS((char *fname, unsigned long l));
-extern int intgetscicosvarsc _PARAMS((char *fname, unsigned long l));
-extern int intcurblkc _PARAMS((char *fname, unsigned long l));
-extern int intbuildouttb _PARAMS((char *fname));
+typedef int (*scicosc_interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct {
+       scicosc_interf f;    /** function **/
+       char *name;      /** its name **/
+} intcscicosTable;
 /*-----------------------------------------------------------------------------------*/ 
 static intcscicosTable Tab[]={
   {inttimescicos,"scicos_time"},
index 9b89929..29debb8 100644 (file)
@@ -1,28 +1,22 @@
-#include "gw_scicos.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-/*-----------------------------------------------------------------------------------*/
-/* interface for the previous function Table */ 
+#include "gw_scicos.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/ 
-extern int C2F(sci_var2vec) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_vec2var) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_curblock) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_getblocklabel) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_scicos_debug) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_scicos_debug_count) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_sctree) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_sci_tree2) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_sci_tree3) _PARAMS((char *fname,unsigned long fname_len));
-extern int C2F(sci_sci_tree4) _PARAMS((char *fname,unsigned long fname_len));
+typedef int (*scicos_interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct {
+       scicos_interf f;    /** function **/
+       char *name;      /** its name **/
+} intscicosTable;
 /*-----------------------------------------------------------------------------------*/ 
 static intscicosTable Tab[]={
-       
 {C2F(sci_var2vec),"var2vec"},
 {C2F(sci_vec2var),"vec2var"},
 {C2F(sci_curblock),"curblock"},
index 5a30e29..389c03f 100644 (file)
@@ -4,25 +4,10 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SIGNAL__
 #define __GW_SIGNAL__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*Signal_Interf) __PARAMS((char *fname,unsigned long l));
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_signal)(void);
-typedef struct table_struct 
-{
-  Signal_Interf f;    /** function **/
-  char *name;      /** its name **/
-} SignalTable;
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_ffir) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_fft) _PARAMS((char *fname,unsigned long fname_len));
index 4cfcd5a..1343e89 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_signal.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_signal.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Signal_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Signal_Interf f;    /** function **/
+       char *name;      /** its name **/
+} SignalTable;
 /*-----------------------------------------------------------------------------------*/
 static SignalTable Tab[]=
 {
index 24eff39..479b79e 100644 (file)
@@ -4,28 +4,15 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SOUND__
 #define __GW_SOUND__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_sound)(void);
-
+/*-----------------------------------------------------------------------------------*/ 
 int sci_Beep __PARAMS((char *fname,unsigned long fname_len));
 int sci_Playsound __PARAMS((char *fname,unsigned long fname_len));
 int sci_savewave __PARAMS((char *fname,unsigned long fname_len));
 int sci_loadwave __PARAMS((char *fname,unsigned long fname_len));
-
-typedef int (*sound_interf) __PARAMS((char *fname,unsigned long fname_len));
-
-typedef struct table_struct {
-  sound_interf f;    /** function **/
-  char *name;      /** its name **/
-} intSoundTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_SOUND__ */
 /*-----------------------------------------------------------------------------------*/
index f408f58..6258060 100644 (file)
@@ -1,15 +1,20 @@
-#include "gw_sound.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
-#include "sciprint.h"
 #include "gw_sound.h"
-
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/ 
+typedef int (*sound_interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct {
+       sound_interf f;    /** function **/
+       char *name;      /** its name **/
+} intSoundTable;
 /*-----------------------------------------------------------------------------------*/ 
 static intSoundTable Tab[]={
        { sci_savewave, "savewave"},
index f6f7610..2fd0523 100644 (file)
@@ -1,8 +1,10 @@
 /*-----------------------------------------------------------------------------------*/ 
-#include "gw_sound.h"
 #ifdef _MSC_VER
+       #include <Windows.h>
        #pragma comment(lib, "winmm.lib")
 #endif
+#include "gw_sound.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/ 
 extern int C2F(cluni0) __PARAMS((char *name, char *nams, integer *ln, long int name_len,long int nams_len));  
 /*-----------------------------------------------------------------------------------*/ 
index 692a824..a85dcae 100644 (file)
@@ -3,6 +3,7 @@
 /* INRIA 2006 */
 /*-----------------------------------------------------------------------------------*/ 
 #include "gw_sound.h"
+#include "stack-c.h"
 #include "MALLOC.h"
 /*-----------------------------------------------------------------------------------*/ 
 static int BeepON=1;
index 35092c3..c3e7942 100644 (file)
@@ -1,4 +1,5 @@
 #include "gw_sound.h"
+#include "stack-c.h"
 #include "sox.h" 
 /*-----------------------------------------------------------------------------------*/ 
 extern int C2F(cluni0) __PARAMS((char *name, char *nams, integer *ln, long int name_len,long int nams_len));  
index 624aaf5..e870a4c 100644 (file)
@@ -1,4 +1,5 @@
 #include "gw_sound.h"
+#include "stack-c.h"
 #include "sox.h"
 /*-----------------------------------------------------------------------------------*/ 
 extern int C2F(cluni0) __PARAMS((char *name, char *nams, integer *ln, long int name_len,long int nams_len));  
index 79845ec..fb5e0a6 100644 (file)
@@ -4,27 +4,9 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SPARSE__
 #define __GW_SPARSE__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/
 int C2F(gw_sparse)(void);
-
-typedef int (*Sparse_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Sparse_Interf f;    /** function **/
-  char *name;      /** its name **/
-} SparseTable;
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_sparsefunc) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_spget) _PARAMS((char *fname,unsigned long fname_len));
@@ -52,7 +34,7 @@ int C2F(sci_bfinit) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_msparse) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_mspget) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_mfull) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/
 #endif /*  __GW_SPARSE__ */
 /*-----------------------------------------------------------------------------------*/
 
index 153f4d6..1d4e168 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_sparse.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_sparse.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Sparse_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Sparse_Interf f;    /** function **/
+       char *name;      /** its name **/
+} SparseTable;
 /*-----------------------------------------------------------------------------------*/
 static SparseTable Tab[]=
 {
index 0562f33..39f15b5 100644 (file)
@@ -4,29 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SPECIAL_FUNCTIONS__
 #define __GW_SPECIAL_FUNCTIONS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "core_math.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_special_functions1)(void);
-
-typedef int (*Special_Functions_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Special_Functions_Interf f;    /** function **/
-  char *name;      /** its name **/
-} SpecialFunctionsTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_oldbesseli) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_oldbesselj) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_oldbesselk) _PARAMS((char *fname,unsigned long fname_len));
@@ -35,7 +17,7 @@ int C2F(sci_gamma) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_lgamma) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_dlgamma) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_calerf) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_SPECIAL_FUNCTIONS__ */
 /*-----------------------------------------------------------------------------------*/
 
index d310e7f..7530c53 100644 (file)
@@ -4,29 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SPECIAL_FUNCTIONS2__
 #define __GW_SPECIAL_FUNCTIONS2__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "core_math.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_special_functions2)(void);
-
-typedef int (*Special_Functions2_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Special_Functions2_Interf f;    /** function **/
-  char *name;      /** its name **/
-} SpecialFunctions2Table;
-
+/*-----------------------------------------------------------------------------------*/ 
 int sci_besselh(char *fname,unsigned long fname_len);
 int sci_besseli(char *fname,unsigned long fname_len);
 int sci_besselj(char *fname,unsigned long fname_len);
@@ -34,7 +16,7 @@ int sci_besselk(char *fname,unsigned long fname_len);
 int sci_bessely(char *fname,unsigned long fname_len);
 int sci_beta(char *fname,unsigned long fname_len);
 int sci_legendre(char *fname,unsigned long fname_len);
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_SPECIAL_FUNCTIONS2__ */
 /*-----------------------------------------------------------------------------------*/
 
index 9ffbf97..5eed739 100644 (file)
@@ -1,11 +1,21 @@
 /*-----------------------------------------------------------------------------------*/
 /* INRIA */
 /*-----------------------------------------------------------------------------------*/
-#include "gw_special_functions1.h"
+#include <string.h>
 /*-----------------------------------------------------------------------------------*/
 #ifdef _MSC_VER
+       #include <windows.h>
        #include "ExceptionMessage.h"
 #endif
+#include "gw_special_functions1.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Special_Functions_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Special_Functions_Interf f;    /** function **/
+       char *name;      /** its name **/
+} SpecialFunctionsTable;
 /*-----------------------------------------------------------------------------------*/
 static SpecialFunctionsTable Tab[]={ 
   {C2F(sci_oldbesseli),"oldbesseli"},
index 05b0931..5570564 100644 (file)
@@ -4,17 +4,22 @@
 #include <string.h> /*pour strcmp */
 #include <math.h>
 #include <setjmp.h>
-#include "gw_special_functions2.h"
 /*-----------------------------------------------------------------------------------*/
 #ifdef _MSC_VER
        #include <Windows.h>
        #include "ExceptionMessage.h"
 #endif
+#include "gw_special_functions2.h"
 #include "stack-c.h"
-#include "sciprint.h"
 /*-----------------------------------------------------------------------------------*/
 extern jmp_buf slatec_jmp_env; 
-
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Special_Functions2_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Special_Functions2_Interf f;    /** function **/
+       char *name;      /** its name **/
+} SpecialFunctions2Table;
 /*-----------------------------------------------------------------------------------*/
 static TabF Tab[]={ 
   {sci_legendre, "legendre"},
index ef43a1b..f35e3c4 100644 (file)
@@ -4,28 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_STATISTICS__
 #define __GW_STATISTICS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_statistics)(void);
-
-typedef int (*Statistics_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Statistics_Interf f;    /** function **/
-  char *name;      /** its name **/
-} StatisticsTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 int cdfbetI(char* fname,unsigned long l);
 int cdfbinI(char* fname,unsigned long l);
 int cdfchiI(char* fname,unsigned long l);
@@ -37,7 +20,7 @@ int cdfnbnI(char* fname,unsigned long l);
 int cdfnorI(char* fname,unsigned long l);
 int cdfpoiI(char* fname,unsigned long l);
 int cdftI(char* fname,unsigned long l);
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_STATISTICS__ */
 /*-----------------------------------------------------------------------------------*/
 
index 9fb0aab..2b3b678 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_statistics.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_statistics.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Statistics_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Statistics_Interf f;    /** function **/
+       char *name;      /** its name **/
+} StatisticsTable;
 /*-----------------------------------------------------------------------------------*/
 static StatisticsTable Tab[]=
 { 
index 0394438..3ad5ac5 100644 (file)
@@ -4,26 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_STRING__
 #define __GW_STRING__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
-typedef int (*String_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-       String_Interf f;    /** function **/
-       char *name;      /** its name **/
-} StringTable;
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_string)(void);
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_length) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_part) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_string) _PARAMS((char *fname,unsigned long fname_len));
@@ -39,6 +24,6 @@ int C2F(sci_ascii) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_grep) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_tokens) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_strsplit) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_STRING__ */
 /*-----------------------------------------------------------------------------------*/
index 7f9b735..eec7d85 100644 (file)
@@ -1,14 +1,21 @@
-#include "gw_string.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_string.h"
+#include "stack-c.h"
 /*-----------------------------------------------------------------------------------*/
-int C2F(gw_string)(void);
+typedef int (*String_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       String_Interf f;    /** function **/
+       char *name;      /** its name **/
+} StringTable;
 /*-----------------------------------------------------------------------------------*/
 static StringTable Tab[]=
 {
@@ -27,7 +34,6 @@ static StringTable Tab[]=
        {C2F(sci_grep),"grep"},
        {C2F(sci_tokens),"tokens"},
        {C2F(sci_strsplit),"strsplit"}
-
 };
 /*-----------------------------------------------------------------------------------*/
 int C2F(gw_string)(void)
index 9bd19a5..345349e 100644 (file)
@@ -4,35 +4,17 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_SYMBOLIC__
 #define __GW_SYMBOLIC__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_symbolic)(void);
-
-typedef int (*Symbolic_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  Symbolic_Interf f;    /** function **/
-  char *name;      /** its name **/
-} SymbolicTable;
-
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_addf) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_subf) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_mulf) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_ldivf) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_rdivf) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_SYMBOLIC__ */
 /*-----------------------------------------------------------------------------------*/
 
index 2978003..31e68bc 100644 (file)
@@ -1,12 +1,21 @@
-#include "gw_symbolic.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
 #include <Windows.h>
 #include "ExceptionMessage.h"
 #endif
+#include "gw_symbolic.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Symbolic_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       Symbolic_Interf f;    /** function **/
+       char *name;      /** its name **/
+} SymbolicTable;
 /*-----------------------------------------------------------------------------------*/
 static SymbolicTable Tab[]=
 {
index 8aaf745..dba1aa2 100644 (file)
@@ -4,28 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_TCLSCI__
 #define __GW_TCLSCI__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
-#include <string.h>
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_tclsci)(void);
-
-typedef int (*TCLSci_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct 
-{
-  TCLSci_Interf f;    /** function **/
-  char *name;      /** its name **/
-} TCLSCITable;
-
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_TCL_DoOneEvent) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_TCL_EvalFile) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_TCL_EvalStr) _PARAMS((char *fname,unsigned long fname_len));
@@ -46,7 +29,7 @@ int C2F(sci_TCL_DeleteInterp) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_TCL_CreateSlave) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_TCL_ExistInterp) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_TCL_ExistArray) _PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_TCLSCI__ */
 /*-----------------------------------------------------------------------------------*/
 
index aad826a..295c2e1 100644 (file)
@@ -1,8 +1,8 @@
-#include "gw_tclsci.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2005 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#include <string.h>
 #ifdef _MSC_VER
        #include <Windows.h>
        #include "ExceptionMessage.h"
 #include "message_scilab.h"
 #include "error_scilab.h"
 #include "gw_tclsci.h"
+#include "stack-c.h"
 #include "inisci-c.h"
 /*-----------------------------------------------------------------------------------*/
+typedef int (*TCLSci_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct 
+{
+       TCLSci_Interf f;    /** function **/
+       char *name;      /** its name **/
+} TCLSCITable;
+/*-----------------------------------------------------------------------------------*/
 extern int TK_Started;
 /*-----------------------------------------------------------------------------------*/
  static TCLSCITable Tab[]=
index d39b37c..3609c23 100644 (file)
@@ -4,17 +4,11 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __GW_TIME__
 #define __GW_TIME__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
-#include "stack-c.h"
-
-typedef int (*time_interf) __PARAMS((char *fname,unsigned long fname_len));
-
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_time)(void);
+/*-----------------------------------------------------------------------------------*/ 
 /* interface for the previous function Table */ 
 /*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_getdate) _PARAMS((char *fname,unsigned long fname_len));
@@ -24,13 +18,6 @@ int C2F(sci_sleep) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_xpause) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_realtimeinit) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_realtime) _PARAMS((char *fname,unsigned long fname_len));
-
-int C2F(gw_time)(void);
-
-typedef struct table_struct {
-  time_interf f;    /** function **/
-  char *name;      /** its name **/
-} intTimeTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 #endif /*  __GW_TIME__ */
 /*-----------------------------------------------------------------------------------*/
index 3bb3583..83edc6d 100644 (file)
@@ -1,12 +1,19 @@
-#include "gw_time.h"
 /*-----------------------------------------------------------------------------------*/
 /* INRIA 2006 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
 #ifdef _MSC_VER
-#include "ExceptionMessage.h"
+       #include <windows.h>
+       #include "ExceptionMessage.h"
 #endif
 #include "gw_time.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*time_interf) __PARAMS((char *fname,unsigned long fname_len));
+typedef struct table_struct {
+       time_interf f;    /** function **/
+       char *name;      /** its name **/
+} intTimeTable;
 /*-----------------------------------------------------------------------------------*/
 static intTimeTable Tab[]={
     {C2F(sci_getdate),"getdate"},
index 24a8128..b2ab085 100644 (file)
@@ -4,25 +4,12 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef __MATWINTOOLS__
 #define __MATWINTOOLS__
-
-#ifdef _MSC_VER
-  #include <windows.h>
-  #include <stdio.h>
-#endif
-
+/*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
-#include "sciprint.h"
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_wintools)(void);
-
-typedef int (*Wintools_Interf) __PARAMS((char *fname,unsigned long l));
-
-typedef struct table_struct {
-  Wintools_Interf f;    /** function **/
-  char *name;      /** its name **/
-} WintoolsTable;
-
+/*-----------------------------------------------------------------------------------*/ 
 int C2F(sci_winopen) _PARAMS((char *fname,unsigned long l));
 int C2F(sci_winqueryreg) _PARAMS((char *fname,unsigned long l));
 int C2F(sci_getlongpathname) _PARAMS((char *fname,unsigned long l));
@@ -49,18 +36,7 @@ int C2F(sci_settextbackgroundcolor) _PARAMS((char *fname,unsigned long l));
 int C2F(sci_filesassociationbox) _PARAMS((char *fname,unsigned long l));
 int C2F(sci_dos) _PARAMS((char *fname,unsigned long l));
 int C2F(sci_findfileassociation) _PARAMS((char *fname,unsigned long l));
-
-#ifndef MAX_PATH
-#define MAX_PATH 512
-#endif
-
-#ifndef MAX_PATH_LONG
-#define MAX_PATH_LONG 32767
-#endif
-
-#ifndef MAX_PATH_SHORT
-#define MAX_PATH_SHORT 260
-#endif
+/*-----------------------------------------------------------------------------------*/ 
 
 #endif /*  __MATWINTOOLS__ */
 /*-----------------------------------------------------------------------------------*/
index 1259f5e..1375da9 100644 (file)
@@ -2,11 +2,19 @@
 /* INRIA 2005 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
-#include "gw_wintools.h"
+#include <string.h>
 #ifdef _MSC_VER
   #include <Windows.h>
   #include "ExceptionMessage.h"
 #endif
+#include "gw_wintools.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+typedef int (*Wintools_Interf) __PARAMS((char *fname,unsigned long l));
+typedef struct table_struct {
+       Wintools_Interf f;    /** function **/
+       char *name;      /** its name **/
+} WintoolsTable;
 /*-----------------------------------------------------------------------------------*/
  static WintoolsTable Tab[]=
  {
index d608564..a081caf 100644 (file)
@@ -4,6 +4,18 @@
 /*-----------------------------------------------------------------------------------*/
 #include "gw_wintools.h"
 #include "MALLOC.h" /* MALLOC */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef MAX_PATH
+#define MAX_PATH 512
+#endif
+
+#ifndef MAX_PATH_LONG
+#define MAX_PATH_LONG 32767
+#endif
+
+#ifndef MAX_PATH_SHORT
+#define MAX_PATH_SHORT 260
+#endif
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_getlongpathname) _PARAMS((char *fname,unsigned long l))
 {
index d844900..471ab42 100644 (file)
@@ -2,6 +2,10 @@
 /* INRIA 2005 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
+#ifdef _MSC_VER
+#include <Windows.h>
+#endif
+
 #include "gw_wintools.h"
 /*-----------------------------------------------------------------------------------*/
 extern int C2F(cluni0) __PARAMS((char *name, char *nams, integer *ln, long int name_len,long int nams_len)); 
index 524bb9e..f9fc390 100644 (file)
@@ -3,6 +3,7 @@
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/
 #include "gw_wintools.h"
+#include "stack-c.h"
 #include "MALLOC.h"
 
 /*-----------------------------------------------------------------------------------*/