Merge remote-tracking branch 'origin/5.4' 50/10650/1
Sylvestre Ledru [Fri, 1 Mar 2013 09:10:43 +0000 (10:10 +0100)]
Conflicts:
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/hashtable/Makefile.in
scilab/libs/hashtable/hashtable.rc
scilab/libs/libst/Makefile.in
scilab/libs/libst/libst.rc
scilab/modules/api_scilab/core_Import.def
scilab/modules/elementary_functions/src/c/core_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/graphics/core_Import.def
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/special_functions.vcxproj

Change-Id: I9f12787dd99bb74bfe89f633c2c7a1aecf5b1bb1

87 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/bin.iss
scilab/configure
scilab/configure.ac
scilab/libs/.gitignore
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/core_Import.def
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/core_Import.def
scilab/modules/external_objects/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/functions/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/core_Import.def
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.in

Simple merge
Simple merge
Simple merge
@@@ -55,8 -49,6 +49,7 @@@ Source: bin\lapack.dll; DestDir: {app}\
  Source: bin\libf2c.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\scilab_windows.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\libxml2.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\libcurl.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
- Source: bin\MALLOC.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\pcre.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\pcreposix.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
Simple merge
Simple merge
@@@ -17,4 -15,3 +15,4 @@@ gl2p
  Eigen
  *.lib
  Eigen
- curl
++curl
Simple merge
Simple merge
Simple merge
@@@ -20,3 -20,5 +20,6 @@@ freeArrayOfStrin
  isopt_
  numopt_
  SciToF77
+ MyHeapAlloc
+ MyHeapFree
++
Simple merge
Simple merge
@@@ -199,10 -194,11 +199,9 @@@ sci_gateway/fortran/sci_f_gschur.f 
  sci_gateway/fortran/sci_f_ereduc.f \
  sci_gateway/fortran/sci_f_findbd.f \
  sci_gateway/fortran/sci_f_fstair.f \
 -sci_gateway/fortran/sci_f_gspec.f \
 -sci_gateway/fortran/sci_f_linmeq.f \
 -sci_gateway/fortran/sci_f_rankqr.f
 +sci_gateway/fortran/sci_f_gspec.f
  
  libscicacsd_la_CPPFLAGS= -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
@@@ -671,10 -660,11 +671,9 @@@ sci_gateway/fortran/sci_f_gschur.f 
  sci_gateway/fortran/sci_f_ereduc.f \
  sci_gateway/fortran/sci_f_findbd.f \
  sci_gateway/fortran/sci_f_fstair.f \
 -sci_gateway/fortran/sci_f_gspec.f \
 -sci_gateway/fortran/sci_f_linmeq.f \
 -sci_gateway/fortran/sci_f_rankqr.f
 +sci_gateway/fortran/sci_f_gspec.f
  
  libscicacsd_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -25,4 -25,6 +25,8 @@@ GetDat
  check_length
  getrhsvar_
  vartype_
- getWarningMode
++getWarningMode
+ MyHeapAlloc
+ MyHeapFree
+ MyHeapRealloc
++
Simple merge
@@@ -56,9 -56,9 +56,9 @@@ src/c/mputl.c 
  src/c/fscanfMat.c \
  src/c/fprintfMat.c \
  src/c/createtempfilename.c \
- src/c/dlManager.c
++src/c/dlManager.c \
+ src/c/convert_tools.c
  
 -
  GATEWAY_SOURCES = \
  sci_gateway/c/gw_fileio.c \
  sci_gateway/c/sci_mfprintf.c \
@@@ -180,12 -179,9 +180,13 @@@ am__objects_1 = libscifileio_algo_la-Fi
        libscifileio_algo_la-fscanfMat.lo \
        libscifileio_algo_la-fprintfMat.lo \
        libscifileio_algo_la-createtempfilename.lo \
-       libscifileio_algo_la-dlManager.lo
++      libscifileio_algo_la-dlManager.lo \
+       libscifileio_algo_la-convert_tools.lo
  am_libscifileio_algo_la_OBJECTS = $(am__objects_1)
  libscifileio_algo_la_OBJECTS = $(am_libscifileio_algo_la_OBJECTS)
 +libscifileio_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +      $(libscifileio_algo_la_LDFLAGS) $(LDFLAGS) -o $@
  @MAINTAINER_MODE_FALSE@am_libscifileio_algo_la_rpath =
  @MAINTAINER_MODE_TRUE@am_libscifileio_algo_la_rpath =
  libscifileio_la_DEPENDENCIES = libscifileio-algo.la
@@@ -564,7 -554,7 +565,8 @@@ src/c/mputl.c 
  src/c/fscanfMat.c \
  src/c/fprintfMat.c \
  src/c/createtempfilename.c \
- src/c/dlManager.c
++src/c/dlManager.c \
+ src/c/convert_tools.c
  
  GATEWAY_SOURCES = \
  sci_gateway/c/gw_fileio.c \
@@@ -1311,13 -1292,13 +1313,20 @@@ libscifileio_algo_la-createtempfilename
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-createtempfilename.lo `test -f 'src/c/createtempfilename.c' || echo '$(srcdir)/'`src/c/createtempfilename.c
  
 +libscifileio_algo_la-dlManager.lo: src/c/dlManager.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-dlManager.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-dlManager.Tpo -c -o libscifileio_algo_la-dlManager.lo `test -f 'src/c/dlManager.c' || echo '$(srcdir)/'`src/c/dlManager.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_algo_la-dlManager.Tpo $(DEPDIR)/libscifileio_algo_la-dlManager.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/dlManager.c' object='libscifileio_algo_la-dlManager.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-dlManager.lo `test -f 'src/c/dlManager.c' || echo '$(srcdir)/'`src/c/dlManager.c
 +
+ libscifileio_algo_la-convert_tools.lo: src/c/convert_tools.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-convert_tools.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-convert_tools.Tpo -c -o libscifileio_algo_la-convert_tools.lo `test -f 'src/c/convert_tools.c' || echo '$(srcdir)/'`src/c/convert_tools.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_algo_la-convert_tools.Tpo $(DEPDIR)/libscifileio_algo_la-convert_tools.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/convert_tools.c' object='libscifileio_algo_la-convert_tools.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-convert_tools.lo `test -f 'src/c/convert_tools.c' || echo '$(srcdir)/'`src/c/convert_tools.c
  libscifileio_la-gw_fileio.lo: sci_gateway/c/gw_fileio.c
  @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_la-gw_fileio.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-gw_fileio.Tpo -c -o libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c
  @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-gw_fileio.Tpo $(DEPDIR)/libscifileio_la-gw_fileio.Plo
@@@ -28,6 -28,6 +28,10 @@@ getScilabMod
  overload_
  xscion_
  getwsmat_
 +getOSRelease
 +getOSFullName
- getSCIHOME
++getSCIHOME
+ MyHeapAlloc
+ MyHeapFree
+ MyHeapRealloc
++
@@@ -76,7 -76,7 +76,7 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -106,7 -106,7 +106,7 @@@ lib /DEF:"$(ProjectDir)Console_Import.d
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -134,7 -134,7 +134,7 @@@ lib /DEF:"$(ProjectDir)Console_Import.d
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -170,7 -170,7 +170,7 @@@ lib /DEF:"$(ProjectDir)Console_Import.d
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -405,4 -395,4 +399,4 @@@ lib /DEF:"$(ProjectDir)Console_Import.d
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
--</Project>
++</Project>
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup>
      <Filter Include="Source Files">
      <ClCompile Include="sci_gateway\c\sci_tempname.c">
        <Filter>Source Files</Filter>
      </ClCompile>
 +    <ClCompile Include="sci_gateway\c\sci_getURL.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="sci_gateway\c\sci_getURLcontent.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="sci_gateway\c\sci_splitURL.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\c\dlManager.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
+     <ClCompile Include="src\c\convert_tools.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
+     <ClCompile Include="src\c\mgeti.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="includes\addfile.h">
        <Filter>localization</Filter>
      </None>
    </ItemGroup>
--</Project>
++</Project>
Simple merge
Simple merge
@@@ -41,6 -65,10 +41,14 @@@ sciReturnUserDat
  stack_
  vartype_
  vstk_
 +GetDataSize
 +GetData
- cha1_
++cha1_
+ MyHeapAlloc
+ MyHeapFree
+ MyHeapRealloc
+ create_hashtable
+ hashtable_destroy
+ hashtable_search
+ hashtable_insert
++
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -40,12 -41,8 +40,11 @@@ sci_gateway/cpp/sci_faddeeva.cp
  # Includes need for the compilation
  libscispecial_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
  -I$(srcdir)/src/c/ \
 +-I$(srcdir)/src/cpp/ \
 +-I$(srcdir)/sci_gateway/cpp/ \
- -I$(top_srcdir)/libs/MALLOC/includes/ \
  -I$(top_srcdir)/modules/core/src/c/ \
  -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +-I$(top_srcdir)/modules/elementary_functions/src/cpp/ \
  -I$(top_srcdir)/modules/api_scilab/includes/ \
  -I$(top_srcdir)/modules/output_stream/includes/ \
  -I$(top_srcdir)/modules/localization/includes/ \
@@@ -498,12 -486,8 +498,11 @@@ sci_gateway/cpp/sci_faddeeva.cp
  # Includes need for the compilation
  libscispecial_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
  -I$(srcdir)/src/c/ \
 +-I$(srcdir)/src/cpp/ \
 +-I$(srcdir)/sci_gateway/cpp/ \
- -I$(top_srcdir)/libs/MALLOC/includes/ \
  -I$(top_srcdir)/modules/core/src/c/ \
  -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +-I$(top_srcdir)/modules/elementary_functions/src/cpp/ \
  -I$(top_srcdir)/modules/api_scilab/includes/ \
  -I$(top_srcdir)/modules/output_stream/includes/ \
  -I$(top_srcdir)/modules/localization/includes/ \
@@@ -262,4 -255,4 +258,4 @@@ lib /DEF:"$(ProjectDir)slatec_f_Import.
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
--</Project>
++</Project>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge