fix build windows (remove windows.h changes header required) + remove preferences... 44/6644/1
Allan CORNET [Thu, 8 Mar 2012 17:32:39 +0000 (18:32 +0100)]
Change-Id: Iccb0f651773b338cefcb4f9fe95028074de502aa

17 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/libs/MALLOC/includes/win_mem_alloc.h
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/src/c/CreateBooleanVariable.c
scilab/modules/matio/src/c/CreateCellVariable.c
scilab/modules/matio/src/c/CreateCharVariable.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/CreateIntegerVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.h
scilab/modules/matio/src/c/CreateSparseVariable.c
scilab/modules/matio/src/c/CreateStructVariable.c
scilab/modules/matio/src/c/GetCharVariable.c
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c

index 1db3254..9878dc9 100644 (file)
@@ -547,16 +547,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{626B9142-13A1-4765-A072-FB08952E7BB8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences", "modules\preferences\src\c\preferences.vcxproj", "{7B893E9F-D032-44DE-9B71-197A29C4989B}"
-       ProjectSection(ProjectDependencies) = postProject
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E} = {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences-Ant", "modules\preferences\src\java\preferences-JAVA.vcxproj", "{32352BC0-9D50-4479-8B77-698287CCB8DE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
-               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
-               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
-       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-level", "Visual-Studio-settings\test-level\test-level.vcxproj", "{07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}"
 EndProject
@@ -1636,7 +1626,6 @@ Global
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.Build.0 = Release|Win32
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.ActiveCfg = Release|x64
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.Build.0 = Release|x64
-<<<<<<< HEAD
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.ActiveCfg = Debug|Win32
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.Build.0 = Debug|Win32
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1645,20 +1634,10 @@ Global
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.Build.0 = Release|Win32
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.ActiveCfg = Release|x64
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.Build.0 = Release|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.Build.0 = Debug|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.ActiveCfg = Debug|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.Build.0 = Debug|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.ActiveCfg = Release|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.Build.0 = Release|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.ActiveCfg = Release|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.Build.0 = Release|x64
-=======
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|Win32.ActiveCfg = Debug|Win32
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|x64.ActiveCfg = Debug|x64
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Release|Win32.ActiveCfg = Release|Win32
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Release|x64.ActiveCfg = Release|x64
->>>>>>> origin/master
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 2bd4f1e..a849f07 100644 (file)
@@ -545,16 +545,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{626B9142-13A1-4765-A072-FB08952E7BB8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences", "modules\preferences\src\c\preferences.vcxproj", "{7B893E9F-D032-44DE-9B71-197A29C4989B}"
-       ProjectSection(ProjectDependencies) = postProject
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E} = {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences-Ant", "modules\preferences\src\java\preferences-JAVA.vcxproj", "{32352BC0-9D50-4479-8B77-698287CCB8DE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
-               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
-               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
-       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-level", "Visual-Studio-settings\test-level\test-level.vcxproj", "{07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}"
 EndProject
@@ -1626,7 +1616,6 @@ Global
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.Build.0 = Release|Win32
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.ActiveCfg = Release|x64
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.Build.0 = Release|x64
-<<<<<<< HEAD
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.ActiveCfg = Debug|Win32
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.Build.0 = Debug|Win32
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1635,20 +1624,10 @@ Global
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.Build.0 = Release|Win32
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.ActiveCfg = Release|x64
                {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.Build.0 = Release|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.Build.0 = Debug|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.ActiveCfg = Debug|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.Build.0 = Debug|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.ActiveCfg = Release|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.Build.0 = Release|Win32
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.ActiveCfg = Release|x64
-               {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.Build.0 = Release|x64
-=======
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|Win32.ActiveCfg = Debug|Win32
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|x64.ActiveCfg = Debug|x64
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Release|Win32.ActiveCfg = Release|Win32
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Release|x64.ActiveCfg = Release|x64
->>>>>>> origin/master
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 2339a42..25c7919 100644 (file)
 #endif
 #define NULL 0
 
+#include <crtdefs.h>
 #include "ExportImport.h" /* IMPORT_EXPORT_MALLOC_DLL */
 
+
 IMPORT_EXPORT_MALLOC_DLL void *MyHeapRealloc(void *lpAddress, size_t dwSize,char *file,int line);
 IMPORT_EXPORT_MALLOC_DLL void *MyHeapAlloc(size_t dwSize, char *file, int line);
 IMPORT_EXPORT_MALLOC_DLL void MyHeapFree(void *lpAddress, char *file, int line);
index 31c12e6..992d799 100644 (file)
  *
  */
 
+#include "api_scilab.h"
 #include "matfile_manager.h"
-#include "MALLOC.h"
 #include "gw_matio.h"
 #include "localization.h"
 #include "Scierror.h"
+#include "MALLOC.h"
 #include "freeArrayOfString.h"
 #ifdef _MSC_VER
 #include "strdup_Windows.h"
 #endif
 
-#include "api_scilab.h"
+
 
 #define MATIO_ERROR if(_SciErr.iErr)        \
     {                                       \
index 1a9e759..efa956f 100644 (file)
  *
  */
 
-#include "matfile_manager.h"
+#include "api_scilab.h"
 #include "MALLOC.h"
+#include "matfile_manager.h"
 #include "gw_matio.h"
 #include "localization.h"
 #include "Scierror.h"
 
-#include "api_scilab.h"
+
 
 #define MATIO_ERROR if(_SciErr.iErr) \
     {                               \
index 17bd5b5..072a720 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-
+#include "api_scilab.h"
 #include "gw_matio.h"
+
 #include "CreateMatlabVariable.h"
-#ifdef _MSC_VER
-#include "strdup_Windows.h"
-#endif
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
 
-#include "api_scilab.h"
 
 #define MATIO_ERROR if(_SciErr.iErr)        \
     {                                       \
index 8674218..9496f92 100644 (file)
 
 #include "api_scilab.h"
 #include "CreateMatlabVariable.h"
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
 
 #define MATIO_ERROR if(_SciErr.iErr) \
     {                               \
index 94d04ab..322847b 100644 (file)
 
 #include "CreateMatlabVariable.h"
 #include "api_scilab.h"
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
+
 
 #define MATIO_ERROR if(_SciErr.iErr) \
     {                               \
index 586202e..c51e76c 100644 (file)
@@ -18,6 +18,9 @@
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
 
 #define MATIO_ERROR if(_SciErr.iErr)        \
     {                                       \
index aa51f5f..25631e4 100644 (file)
 
 #include "CreateMatlabVariable.h"
 #include "api_scilab.h"
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
+
 
 int CreateHyperMatrixVariable(int iVar, const char *type, int *iscomplex, int * rank, int *dims, double *realdata, double *complexdata, int * parent, int item_position)
 {
index 1936524..23bbadd 100644 (file)
 
 #include "CreateMatlabVariable.h"
 #include "api_scilab.h"
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
+
 
 #define MATIO_ERROR if(_SciErr.iErr) \
     {                               \
index fc1e3a2..25a2405 100644 (file)
 #define __CREATEMATLABVARIABLE_H__
 
 #include "matfile_manager.h"
-#include "MALLOC.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "sciprint.h"
 
 /*
  * Create a Scilab variable on stack from a Matlab variable
index 4ce0617..ee4c2c4 100644 (file)
 #include "CreateMatlabVariable.h"
 #include "stack-c.h"
 #include "api_scilab.h"
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
+
 
 #define MATIO_ERROR if(_SciErr.iErr) \
     {                               \
index 572217e..b594bc9 100644 (file)
 #include "CreateMatlabVariable.h"
 #include "freeArrayOfString.h"
 #include "api_scilab.h"
+#include "MALLOC.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "sciprint.h"
 
 #define MATIO_ERROR if(_SciErr.iErr) \
     {                               \
index e4eb8e0..a8af5f6 100644 (file)
@@ -19,6 +19,8 @@
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
+#include "MALLOC.h"
+#include "localization.h"
 
 matvar_t *GetCharVariable(int iVar, const char *name, int * parent, int item_position)
 {
index f83c986..8ab6a4b 100644 (file)
@@ -12,6 +12,7 @@
 
 /*----------------------------------------------------------------------------*/
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "gw_string.h"
index 9d3d016..7b7809e 100644 (file)
  */
 /*--------------------------------------------------------------------------*/
 #include "gw_windows_tools.h"
+#include "registry.h"
 #include "api_scilab.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "PATH_MAX.h"
 #include "freeArrayOfString.h"
-
-#include "registry.h"
-#include "stack-c.h"
 /*--------------------------------------------------------------------------*/
 int sci_winqueryreg(char *fname,unsigned long l)
 {