fix build windows 53/153/2
Allan CORNET [Fri, 16 Apr 2010 10:55:07 +0000 (12:55 +0200)]
Change-Id: I208779c84e07a3bf2489828786f3d10baa1ff808

scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/cpp/search_functions.cpp
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcproj

index 5468318..e5c58b9 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\cpp\namstr.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\parse.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\cpp\search_functions.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\..\call_scilab\src\c\SendScilabJobs.c"
                                >
                        </File>
index 7fa7b6f..6f69628 100644 (file)
@@ -18,7 +18,8 @@ extern "C" {
 #include "stack-def.h" /* C2F(basbrk) */
 #include "intmacr2tree.h" /*#define idstk(x,y) (C2F(vstk).idstk+(x-1)+(y-1)*nsiz) */
 
-    void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn, int* nbibn, int* ilp, int* nn, int* should_return);
+    void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn, int* nbibn,
+        int* ilp, int* nn, int* should_return);
     void C2F(sivars)(int* id, int* should_return);
     void C2F(namstr)(int* id, int* str, int* n, char const* job);
 }
@@ -67,7 +68,8 @@ namespace
  * function that it should return at once.
  * other variables are lifted straight from Fortran code.
  */
-void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn_ptr, int* nbibn_ptr, int* ilp_ptr, int* nn_ptr, int* should_return)
+void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn_ptr, int* nbibn_ptr,
+                  int* ilp_ptr, int* nn_ptr, int* should_return)
 {
 
     static int const* const lstk_ptr = (int*)C2F(vstk).lstk-1;
@@ -87,7 +89,11 @@ void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn_ptr, int* nbibn_ptr
             lbibn = il+2;
             il += nbibn+2;
             ilp = il+1;
+#ifdef _MSC_VER
+            ip = max(1, id_char(id)-9);
+#else
             ip = std::max(1, id_char(id)-9);
+#endif
             if (ip <= nclas)
             {
 
index 971d811..20cbb52 100644 (file)
@@ -139,7 +139,6 @@ cd .."/></Configuration></Configurations>
                <File RelativePath="mklist.f"/>
                <File RelativePath="mname.f"/>
                <File RelativePath="mrknmd.f"/>
-               <File RelativePath="namstr.f"/>
                <File RelativePath="nextj.f"/>
                <File RelativePath="prompt.f"/>
                <File RelativePath="ptover.f"/>
index e41f627..a6085d4 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                >
                        </File>
                        <File
-                               RelativePath=".\namstr.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\nextj.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\namstr.f"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\nextj.f"
                                >
                        </File>