2 files changed, 7 insertions, 3 deletions
diff --git a/scilab/modules/localization/src/c/getLocaleInfo_Windows.c b/scilab/modules/localization/src/c/getLocaleInfo_Windows.c
index af244ec..2e6ae3e 100644
--- a/scilab/modules/localization/src/c/getLocaleInfo_Windows.c
+++ b/scilab/modules/localization/src/c/getLocaleInfo_Windows.c
@@ -42,6 +42,9 @@ char* getLocaleSystemInfo(void)
                        localeStr = (char*)MALLOC(sizeof(char)*(length_localeStr)+1);
                        if (localeStr)
                        {
+                                #ifdef FORMAT_LOCALE
+                                        #undef FORMAT_LOCALE
+                                #endif
                                #define FORMAT_LOCALE "%s_%s"
                                sprintf(localeStr,FORMAT_LOCALE,buffer_LOCALE_SISO639LANGNAME,buffer_LOCALE_SISO3166CTRYNAME);
                        }
@@ -84,6 +87,9 @@ char* getLocaleUserInfo(void)
                        localeStr = (char*)MALLOC(sizeof(char)*(length_localeStr)+1);
                        if (localeStr)
                        {
+                                #ifdef FORMAT_LOCALE
+                                        #undef FORMAT_LOCALE
+                                #endif
                                #define FORMAT_LOCALE "%s_%s.CP%s"
                                // in lang_contry.CPxxx format
                                sprintf(localeStr,FORMAT_LOCALE,
diff --git a/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj b/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
index 3783fb1..e185a12 100644
--- a/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
+++ b/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
@@ -6,7 +6,7 @@
        ProjectGUID="{566E524B-D327-4416-A865-9C83503FAB7B}"
        RootNamespace="scicos_f2c"
        Keyword="Win32Proj"
-        
+        TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -56,7 +56,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="6"
-                                AdditionalOptions="/fixed:no"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../libs/f2c"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_F2C_EXPORTS;FORDLL"
@@ -154,7 +153,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/fixed:no"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../libs/f2c"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_F2C_EXPORTS;FORDLL"

diff --git a/scilab/modules/localization/src/c/getLocaleInfo_Windows.c b/scilab/modules/localization/src/c/getLocaleInfo_Windows.c index af244ec..2e6ae3e 100644 --- a/scilab/modules/localization/src/c/getLocaleInfo_Windows.c +++ b/scilab/modules/localization/src/c/getLocaleInfo_Windows.c
@@ -42,6 +42,9 @@ char* getLocaleSystemInfo(void)
42	localeStr = (char)MALLOC(sizeof(char)(length_localeStr)+1);	42	localeStr = (char)MALLOC(sizeof(char)(length_localeStr)+1);
43	if (localeStr)	43	if (localeStr)
44	{	44	{
		45	#ifdef FORMAT_LOCALE
		46	#undef FORMAT_LOCALE
		47	#endif
45	#define FORMAT_LOCALE "%s_%s"	48	#define FORMAT_LOCALE "%s_%s"
46	sprintf(localeStr,FORMAT_LOCALE,buffer_LOCALE_SISO639LANGNAME,buffer_LOCALE_SISO3166CTRYNAME);	49	sprintf(localeStr,FORMAT_LOCALE,buffer_LOCALE_SISO639LANGNAME,buffer_LOCALE_SISO3166CTRYNAME);
47	}	50	}
@@ -84,6 +87,9 @@ char* getLocaleUserInfo(void)
84	localeStr = (char)MALLOC(sizeof(char)(length_localeStr)+1);	87	localeStr = (char)MALLOC(sizeof(char)(length_localeStr)+1);
85	if (localeStr)	88	if (localeStr)
86	{	89	{
		90	#ifdef FORMAT_LOCALE
		91	#undef FORMAT_LOCALE
		92	#endif
87	#define FORMAT_LOCALE "%s_%s.CP%s"	93	#define FORMAT_LOCALE "%s_%s.CP%s"
88	// in lang_contry.CPxxx format	94	// in lang_contry.CPxxx format
89	sprintf(localeStr,FORMAT_LOCALE,	95	sprintf(localeStr,FORMAT_LOCALE,


diff --git a/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj b/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj index 3783fb1..e185a12 100644 --- a/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj +++ b/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
@@ -6,7 +6,7 @@
6	ProjectGUID="{566E524B-D327-4416-A865-9C83503FAB7B}"	6	ProjectGUID="{566E524B-D327-4416-A865-9C83503FAB7B}"
7	RootNamespace="scicos_f2c"	7	RootNamespace="scicos_f2c"
8	Keyword="Win32Proj"	8	Keyword="Win32Proj"
9		9	TargetFrameworkVersion="0"
10	>	10	>
11	<Platforms>	11	<Platforms>
12	<Platform	12	<Platform
@@ -56,7 +56,6 @@
56	<Tool	56	<Tool
57	Name="VCCLCompilerTool"	57	Name="VCCLCompilerTool"
58	ExecutionBucket="6"	58	ExecutionBucket="6"
59	AdditionalOptions="/fixed:no"
60	Optimization="0"	59	Optimization="0"
61	AdditionalIncludeDirectories="../../../../libs/f2c"	60	AdditionalIncludeDirectories="../../../../libs/f2c"
62	PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_F2C_EXPORTS;FORDLL"	61	PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_F2C_EXPORTS;FORDLL"
@@ -154,7 +153,6 @@
154	/>	153	/>
155	<Tool	154	<Tool
156	Name="VCCLCompilerTool"	155	Name="VCCLCompilerTool"
157	AdditionalOptions="/fixed:no"
158	Optimization="0"	156	Optimization="0"
159	AdditionalIncludeDirectories="../../../../libs/f2c"	157	AdditionalIncludeDirectories="../../../../libs/f2c"
160	PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_F2C_EXPORTS;FORDLL"	158	PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_F2C_EXPORTS;FORDLL"