Remove colliding files on case-insensitive filesystem

Change-Id: I5c56fb9d7d14a1a7b16339daf7414947d6350094

diff --git a/scilab/modules/fftw/Elementary_functions_f_Import.def b/scilab/modules/fftw/Elementary_functions_f_Import.def
deleted file mode 100644 (file)
index a687a67..0000000
--- a/scilab/modules/fftw/Elementary_functions_f_Import.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY    elementary_functions_f.dll
-
-
-EXPORTS
-dset_
\ No newline at end of file

diff --git a/scilab/modules/fftw/fftw.vcxproj b/scilab/modules/fftw/fftw.vcxproj
index f43ac77..4258185 100644 (file)
--- a/scilab/modules/fftw/fftw.vcxproj
+++ b/scilab/modules/fftw/fftw.vcxproj
@@ -89,7 +89,7 @@
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
@@ -117,7 +117,7 @@ lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
@@ -146,7 +146,7 @@ lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
@@ -180,7 +180,7 @@ lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
@@ -229,7 +229,7 @@ lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ResourceCompile Include="src\c\fftw.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Elementary_functions_f_Import.def" />
+    <None Include="elementary_functions_f_Import.def" />
     <None Include="core_import.def" />
     <None Include="fftw.iss" />
     <None Include="locales\fftw.pot" />

diff --git a/scilab/modules/fftw/fftw.vcxproj.filters b/scilab/modules/fftw/fftw.vcxproj.filters
index 3c43434..da30352 100644 (file)
--- a/scilab/modules/fftw/fftw.vcxproj.filters
+++ b/scilab/modules/fftw/fftw.vcxproj.filters
@@ -114,7 +114,7 @@
     <None Include="fftw.iss" />
     <None Include="sci_gateway\fftw_gateway.xml" />
     <None Include="Makefile.am" />
-    <None Include="Elementary_functions_f_Import.def">
+    <None Include="elementary_functions_f_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
     <None Include="locales\fftw.pot">

diff --git a/scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c b/scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
index dca148d..706412f 100644 (file)
--- a/scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
+++ b/scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
@@ -209,7 +209,7 @@ int sci_fftw_flags(char *fname,  void* pvApiCtx)
                 sciErr = getMatrixOfString(pvApiCtx, piAddr1, &m1, &n1, piLen, NULL);
                 if (sciErr.iErr)
                 {
-                    free(piLen);
+                    FREE(piLen);
                     printError(&sciErr, 0);
                     return 1;
                 }
@@ -224,7 +224,7 @@ int sci_fftw_flags(char *fname,  void* pvApiCtx)
                 sciErr = getMatrixOfString(pvApiCtx, piAddr1, &m1, &n1, piLen, Str1);
                 if (sciErr.iErr)
                 {
-                    free(piLen);
+                    FREE(piLen);
                     freeArrayOfString(Str1, m1 * n1);
                     printError(&sciErr, 0);
                     return 1;
@@ -242,7 +242,7 @@ int sci_fftw_flags(char *fname,  void* pvApiCtx)
 
                     if (i == nb_flag)
                     {
-                        free(piLen);
+                        FREE(piLen);
                         freeArrayOfString(Str1, m1 * n1);
                         Scierror(999, _("%s: Wrong values for input argument #%d: FFTW flag expected.\n"), fname, 1);
                         return 0;
@@ -257,7 +257,7 @@ int sci_fftw_flags(char *fname,  void* pvApiCtx)
                 }
 
                 uiVar1 = (unsigned int)flagv;
-                free(piLen);
+                FREE(piLen);
                 freeArrayOfString(Str1, m1 * n1);
                 m1 = 1;
                 n1 = 1;

diff --git a/scilab/modules/graphics/Elementary_functions_f_Import.def b/scilab/modules/graphics/Elementary_functions_f_Import.def
deleted file mode 100644 (file)
index c967a73..0000000
--- a/scilab/modules/graphics/Elementary_functions_f_Import.def
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY    elementary_functions_f.dll
-
-
-EXPORTS
-;--------------------------
-; elementary_functions_f
-;--------------------------
-dsort_
\ No newline at end of file

diff --git a/scilab/modules/graphics/graphics.vcxproj b/scilab/modules/graphics/graphics.vcxproj
index 26afe11..bad940e 100644 (file)
--- a/scilab/modules/graphics/graphics.vcxproj
+++ b/scilab/modules/graphics/graphics.vcxproj
@@ -741,7 +741,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClInclude Include="src\c\XsetXgetParameters.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Elementary_functions_f_Import.def" />
+    <None Include="elementary_functions_f_Import.def" />
     <None Include="Gui_Import.def" />
     <None Include="core_import.def" />
     <None Include="graphics.iss" />

diff --git a/scilab/modules/graphics/graphics.vcxproj.filters b/scilab/modules/graphics/graphics.vcxproj.filters
index 9149082..4580e05 100644 (file)
--- a/scilab/modules/graphics/graphics.vcxproj.filters
+++ b/scilab/modules/graphics/graphics.vcxproj.filters
@@ -1524,7 +1524,7 @@
     <None Include="graphics.iss" />
     <None Include="sci_gateway\graphics_gateway.xml" />
     <None Include="Makefile.am" />
-    <None Include="Elementary_functions_f_Import.def">
+    <None Include="elementary_functions_f_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
     <None Include="locales\graphics.pot" />