fix warnings on Windows and add headers required in binary version 97/5797/1
Allan CORNET [Tue, 3 Jan 2012 07:29:53 +0000 (08:29 +0100)]
Change-Id: I9cb1b9386af37fadb8f9df910544d10c764d3942

SEP/SEP_035_selection_of_installed_header.odt
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/includes/scicos.h
scilab/modules/scicos/sci_gateway/c/sci_scicosim.c
scilab/modules/scicos/scicos.iss
scilab/modules/scicos_blocks/includes/scicos_block4.h

index 3a9e01c..94fb832 100644 (file)
Binary files a/SEP/SEP_035_selection_of_installed_header.odt and b/SEP/SEP_035_selection_of_installed_header.odt differ
index c1e7f88..8e1c97b 100644 (file)
@@ -160,7 +160,10 @@ libsciscicos_la_include_HEADERS = includes/scicos.h \
 includes/scicos-def.h \
 includes/scicos_free.h \
 includes/scicos_malloc.h \
-includes/scicos_math.h
+includes/scicos_math.h \
+includes/dynlib_scicos.h \
+includes/import.h
+
 
 
 #### scicos : cosf files ####
index 028814a..dfee39d 100644 (file)
@@ -384,7 +384,8 @@ DATA = $(libsciscicos_la_etc_DATA) $(libsciscicos_la_root_DATA) \
        $(nobase_libsciscicos_la_cosf_DATA)
 am__libsciscicos_la_include_HEADERS_DIST = includes/scicos.h \
        includes/scicos-def.h includes/scicos_free.h \
-       includes/scicos_malloc.h includes/scicos_math.h
+       includes/scicos_malloc.h includes/scicos_math.h \
+       includes/dynlib_scicos.h includes/import.h
 HEADERS = $(libsciscicos_la_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -951,7 +952,9 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @XCOS_TRUE@includes/scicos-def.h \
 @XCOS_TRUE@includes/scicos_free.h \
 @XCOS_TRUE@includes/scicos_malloc.h \
-@XCOS_TRUE@includes/scicos_math.h
+@XCOS_TRUE@includes/scicos_math.h \
+@XCOS_TRUE@includes/dynlib_scicos.h \
+@XCOS_TRUE@includes/import.h
 
 
 #### scicos : cosf files ####
index 959e6be..2566e60 100644 (file)
@@ -33,7 +33,12 @@ block of type 2 */
 of type 0 */
 #define TB_SIZE 500
 
+#ifdef _MSC_VER
+typedef void (*voidf) ();
+#else
 typedef void (*voidf) (void);
+#endif
+
 
 /* Blocks prototypes */
 #define I int
index ca708ea..08fc59b 100644 (file)
@@ -182,13 +182,6 @@ int sci_scicosim(char *fname,unsigned long fname_len)
                int nbvars;
        } intersci_list ;
 
-       typedef struct /* declaration of outtb_elem -valable dans inctscicos.c- */
-       {
-               int lnk;
-               int pos;
-       } outtb_el;
-
-
        intersci_list *loc = NULL;
        intersci_state *new = NULL ;
 
index f054dbd..64c8462 100644 (file)
@@ -43,6 +43,8 @@ Source: modules\{#SCICOS}\includes\scicos_free.h; DestDir: {app}\modules\{#SCICO
 Source: modules\{#SCICOS}\includes\scicos_malloc.h; DestDir: {app}\modules\{#SCICOS}\includes; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS}\includes\scicos_math.h; DestDir: {app}\modules\{#SCICOS}\includes; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS}\includes\scicos-def.h; DestDir: {app}\modules\{#SCICOS}\includes; Components: {#COMPN_XCOS}
+Source: modules\{#SCICOS}\includes\dynlib_scicos.h; DestDir: {app}\modules\{#SCICOS}\includes; Components: {#COMPN_XCOS}
+Source: modules\{#SCICOS}\includes\import.h; DestDir: {app}\modules\{#SCICOS}\includes; Components: {#COMPN_XCOS}
 ;
 Source: modules\{#SCICOS}\macros\buildmacros.sce; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS}\macros\lib; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
index cc9065f..5b078ae 100755 (executable)
 #include <math.h>
 #include <stdlib.h>
 
+#ifdef _MSC_VER
+typedef void (*voidg) ();
+#else
 typedef void (*voidg) (void);
+#endif
 
 /* scicos_block structure definition
 * WARNING: take care that this sructure is