include cvstr
Allan CORNET [Mon, 22 Jun 2009 15:07:54 +0000 (17:07 +0200)]
scilab/modules/scicos/sci_gateway/c/intcutilcos.c
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/readau.c
scilab/modules/scicos_blocks/src/c/readc.c
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
scilab/modules/scicos_blocks/src/c/tows_c.c
scilab/modules/scicos_blocks/src/c/writec.c

index e3ce070..127fbac 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "stack-c.h"
 #include "MALLOC.h"
-//#include "mex.h"
 #include "scicos_block4.h"
 #include "scicos.h"
 #include "intcscicos.h"
index 5279e6e..0dc91c9 100644 (file)
@@ -65,7 +65,7 @@
 #include "ida_impl.h"
 #include "kinsol.h"
 #include "kinsol_dense.h"
-
+#include "cvstr.h"
 
 #include "ezxml.h"
 
@@ -202,8 +202,6 @@ extern void  sciblk2();
 extern void  sciblk4();
 extern void  GetDynFunc();
 extern void  C2F(iislink)();
-
-extern int C2F(cvstr)();
 extern int C2F(dset)();
 extern int C2F(dcopy)();
 extern int C2F(iset)();
index 437bf1a..892ef61 100644 (file)
@@ -33,6 +33,7 @@
  */
 #include "stack-c.h"
 #include "sciprint.h"
+#include "cvstr.h"
 
 #if _MSC_VER
 #define NULL    0
@@ -47,7 +48,7 @@
 #define TNm1      ptr->workt[nPoints-1]
 #define TP        (TNm1-0)
 
-extern int C2F(cvstr)(int *,int *,char *,int *,unsigned long int);
+
 extern int C2F(mgetnc)();
 extern void C2F(mopen)();
 extern int C2F(cluni0)(char *name, char *nams, int *ln, long int name_len,long int nams_len);
index 30cecdc..fd7f48b 100644 (file)
@@ -24,8 +24,8 @@
 #include "sciprint.h"
 #include "machine.h"
 #include "charEncoding.h"
+#include "cvstr.h"
 
-extern  int C2F(cvstr)(int *,int *,char *,int *,unsigned long int);
 extern void mget2(FILE *fa, int swap, double *res, int n, char *type, int *ierr);
 void 
 readau(flag,nevprt,t,xd,x,nx,z,nz,tvec,ntvec,rpar,nrpar,
index bc9ca39..363cd56 100644 (file)
@@ -23,8 +23,8 @@
 #include "sciprint.h"
 #include "machine.h"
 #include "charEncoding.h"
+#include "cvstr.h"
 
-extern  int C2F(cvstr)(int *,int *,char *,int *,unsigned long int);
 extern void mget2(FILE *fa, int swap, double *res, int n, char *type, int *ierr);
 
 
index b28c7be..811bfea 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 1880b5a..31243f2 100644 (file)
 #include "stack-c.h"
 #include "MALLOC.h"
 #include "sciprint.h"
-
+#include "cvstr.h"
 
 #if _MSC_VER
 #define NULL    0
 #endif
 
-extern int C2F(cvstr)();
+
 extern int C2F(cluni0)();
 extern int C2F(mclose)();
 
index 2f8813c..a6bb625 100644 (file)
@@ -23,8 +23,9 @@
 #include "sciprint.h"
 #include "machine.h"
 #include "charEncoding.h"
+#include "cvstr.h"
+
 
-extern  int C2F(cvstr)(int *,int *,char *,int *,unsigned long int);
 void mput2  (FILE *fa, int swap, double *res, int n, char *type, int *ierr);
 
 void