mac compilation fixed about multiple definition. 37/16837/3
Cedric Delamarre [Fri, 10 Jul 2015 12:35:15 +0000 (14:35 +0200)]
Change-Id: If577b65e5fb35b0f39b076160984c229a51b1533

18 files changed:
scilab/modules/cacsd/src/fortran/core_Import.def
scilab/modules/differential_equations/includes/common_structure.h
scilab/modules/differential_equations/src/c/errmds.c
scilab/modules/elementary_functions/src/fortran/core_Import.def
scilab/modules/elementary_functions/src/fortran/slatec/core_Import.def
scilab/modules/optimization/src/fortran/core_Import.def
scilab/modules/output_stream/src/c/core_Import.def
scilab/modules/output_stream/src/fortran/core_Import.def
scilab/modules/polynomials/src/fortran/core_Import.def
scilab/modules/randlib/src/fortran/core_Import.def
scilab/modules/scicos/src/c/core_Import.def
scilab/modules/scicos/src/c/scilab5_needed_stubs.c
scilab/modules/scicos/src/fortran/Scicos_Import.def
scilab/modules/signal_processing/src/fortran/core_Import.def
scilab/modules/sparse/src/fortran/core_Import.def
scilab/modules/special_functions/src/c/core_Import.def
scilab/modules/special_functions/src/fortran/core_Import.def
scilab/modules/symbolic/src/fortran/core_Import.def

index 79587bf..e23435c 100644 (file)
@@ -119,27 +119,16 @@ typedef struct
 } STR_LS0001;
 
 #ifdef _MSC_VER
-DIFFERENTIAL_EQUATIONS_IMPEXP STR_ERRGST C2F(errgst);
 DIFFERENTIAL_EQUATIONS_IMPEXP STR_IERODE C2F(ierode);
 DIFFERENTIAL_EQUATIONS_IMPEXP STR_EH0001 C2F(eh0001);
 DIFFERENTIAL_EQUATIONS_IMPEXP STR_LSA001 C2F(lsa001);
 DIFFERENTIAL_EQUATIONS_IMPEXP STR_LSR001 C2F(lsr001);
 DIFFERENTIAL_EQUATIONS_IMPEXP STR_LS0001 C2F(ls0001);
 #else
-#ifdef __DIFFERENTIAL_EQUATIONS_GW_HXX__
-extern STR_ERRGST C2F(errgst);
 extern STR_IERODE C2F(ierode);
 extern STR_EH0001 C2F(eh0001);
 extern STR_LSA001 C2F(lsa001);
 extern STR_LSR001 C2F(lsr001);
 extern STR_LS0001 C2F(ls0001);
-#else
-STR_ERRGST C2F(errgst);
-STR_IERODE C2F(ierode);
-STR_EH0001 C2F(eh0001);
-STR_LSA001 C2F(lsa001);
-STR_LSR001 C2F(lsr001);
-STR_LS0001 C2F(ls0001);
-#endif
 #endif
 #endif /* !__COMMOM_STRUCTURE_H__ */
index ca4726f..65ee682 100644 (file)
@@ -12,6 +12,9 @@
 
 #include "errmds.h"
 #include "common_structure.h"
+
+DIFFERENTIAL_EQUATIONS_IMPEXP STR_ERRGST C2F(errgst);
+
 /*--------------------------------------------------------------------------*/
 int C2F(errmds)(int *num, int *imess, int *imode)
 {
index 9aa0cea..79001e7 100644 (file)
@@ -5,7 +5,6 @@ EXPORTS
 ;
 ;core
 iop_
-errgst_
 com_
 parse_
 isrecursioncalltofunction_
@@ -13,5 +12,4 @@ eqid_
 ; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol
 ;
 adre_
-errgst_
 ;
index 196d1a8..67c7862 100644 (file)
@@ -4,7 +4,6 @@
 EXPORTS
 iop_
 com_
-errgst_
 get_sci_data_strings
 getstackinfo_
 getIntermediateMemoryNeeded
index 99060f4..b01903d 100644 (file)
@@ -25,7 +25,6 @@ getsmat_
 ; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol
 ;
 adre_
-errgst_
 ;
 
 
index eb268fd..4caae25 100644 (file)
@@ -10,6 +10,5 @@ csimp_
 ;
 ; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol
 ;
-errgst_
 adre_
 ;
index 2d08fa9..96e8a0a 100644 (file)
@@ -11,7 +11,6 @@ iop_
 ; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol
 ;
 adre_
-errgst_
 com_
 ;
 
index 0a52a3d..b9b3023 100644 (file)
@@ -10,7 +10,6 @@ MyHeapFree
 MyHeapRealloc
 xscion_
 iop_
-errgst_
 ierode_
 ismenu
 GetCommand
index 007aa2c..8d7acca 100644 (file)
@@ -14,10 +14,6 @@ SCICOS_IMPEXP void F2C(ismenu)()
 {
     abort();
 }
-SCICOS_IMPEXP void F2C(errgst)()
-{
-    abort();
-}
 SCICOS_IMPEXP void F2C(check_dims)()
 {
     abort();
index 4d0bcf4..e16cb50 100644 (file)
@@ -7,7 +7,6 @@ EXPORTS
 com_
 iop_
 mtlbc_
-errgst_
 ;
 ; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol
 ;
index 5a38484..bcfbe22 100644 (file)
@@ -11,7 +11,6 @@ checkrhs_
 getrhsvar_
 getrhscvar_
 createvar_
-errgst_
 check_dim_prop
 createcvar_
 check_scalar