summaryrefslogtreecommitdiffstats
path: root/scilab/modules/core
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-04-16 12:55:07 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-04-16 13:52:17 +0200
commitcfe1255b0c6d0ec553ba4123e7c96a5fe5eead66 (patch)
tree0a8d3386b08554bd1d4ce83ab454e3d9472852aa /scilab/modules/core
parent8384404a2d6c08f13d14d85c8ef4273d69b45f81 (diff)
downloadscilab-cfe1255b0c6d0ec553ba4123e7c96a5fe5eead66.zip
scilab-cfe1255b0c6d0ec553ba4123e7c96a5fe5eead66.tar.gz
fix build windows
Change-Id: I208779c84e07a3bf2489828786f3d10baa1ff808
Diffstat (limited to 'scilab/modules/core')
-rw-r--r--scilab/modules/core/src/c/core.vcproj8
-rw-r--r--scilab/modules/core/src/cpp/search_functions.cpp10
-rw-r--r--scilab/modules/core/src/fortran/core_f.vfproj1
-rw-r--r--scilab/modules/core/src/fortran/core_f2c.vcproj10
4 files changed, 17 insertions, 12 deletions
diff --git a/scilab/modules/core/src/c/core.vcproj b/scilab/modules/core/src/c/core.vcproj
index 5468318..e5c58b9 100644
--- a/scilab/modules/core/src/c/core.vcproj
+++ b/scilab/modules/core/src/c/core.vcproj
@@ -565,6 +565,10 @@
565 > 565 >
566 </File> 566 </File>
567 <File 567 <File
568 RelativePath="..\cpp\namstr.cpp"
569 >
570 </File>
571 <File
568 RelativePath=".\parse.c" 572 RelativePath=".\parse.c"
569 > 573 >
570 </File> 574 </File>
@@ -841,6 +845,10 @@
841 > 845 >
842 </File> 846 </File>
843 <File 847 <File
848 RelativePath="..\cpp\search_functions.cpp"
849 >
850 </File>
851 <File
844 RelativePath="..\..\..\call_scilab\src\c\SendScilabJobs.c" 852 RelativePath="..\..\..\call_scilab\src\c\SendScilabJobs.c"
845 > 853 >
846 </File> 854 </File>
diff --git a/scilab/modules/core/src/cpp/search_functions.cpp b/scilab/modules/core/src/cpp/search_functions.cpp
index 7fa7b6f..6f69628 100644
--- a/scilab/modules/core/src/cpp/search_functions.cpp
+++ b/scilab/modules/core/src/cpp/search_functions.cpp
@@ -18,7 +18,8 @@ extern "C" {
18#include "stack-def.h" /* C2F(basbrk) */ 18#include "stack-def.h" /* C2F(basbrk) */
19#include "intmacr2tree.h" /*#define idstk(x,y) (C2F(vstk).idstk+(x-1)+(y-1)*nsiz) */ 19#include "intmacr2tree.h" /*#define idstk(x,y) (C2F(vstk).idstk+(x-1)+(y-1)*nsiz) */
20 20
21 void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn, int* nbibn, int* ilp, int* nn, int* should_return); 21 void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn, int* nbibn,
22 int* ilp, int* nn, int* should_return);
22 void C2F(sivars)(int* id, int* should_return); 23 void C2F(sivars)(int* id, int* should_return);
23 void C2F(namstr)(int* id, int* str, int* n, char const* job); 24 void C2F(namstr)(int* id, int* str, int* n, char const* job);
24} 25}
@@ -67,7 +68,8 @@ namespace
67 * function that it should return at once. 68 * function that it should return at once.
68 * other variables are lifted straight from Fortran code. 69 * other variables are lifted straight from Fortran code.
69 */ 70 */
70void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn_ptr, int* nbibn_ptr, int* ilp_ptr, int* nn_ptr, int* should_return) 71void C2F(siflibs)(int* id, int* k_ptr, int* istr, int* lbibn_ptr, int* nbibn_ptr,
72 int* ilp_ptr, int* nn_ptr, int* should_return)
71{ 73{
72 74
73 static int const* const lstk_ptr = (int*)C2F(vstk).lstk-1; 75 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
87 lbibn = il+2; 89 lbibn = il+2;
88 il += nbibn+2; 90 il += nbibn+2;
89 ilp = il+1; 91 ilp = il+1;
92#ifdef _MSC_VER
93 ip = max(1, id_char(id)-9);
94#else
90 ip = std::max(1, id_char(id)-9); 95 ip = std::max(1, id_char(id)-9);
96#endif
91 if (ip <= nclas) 97 if (ip <= nclas)
92 { 98 {
93 99
diff --git a/scilab/modules/core/src/fortran/core_f.vfproj b/scilab/modules/core/src/fortran/core_f.vfproj
index 971d811..20cbb52 100644
--- a/scilab/modules/core/src/fortran/core_f.vfproj
+++ b/scilab/modules/core/src/fortran/core_f.vfproj
@@ -139,7 +139,6 @@ cd .."/></Configuration></Configurations>
139 <File RelativePath="mklist.f"/> 139 <File RelativePath="mklist.f"/>
140 <File RelativePath="mname.f"/> 140 <File RelativePath="mname.f"/>
141 <File RelativePath="mrknmd.f"/> 141 <File RelativePath="mrknmd.f"/>
142 <File RelativePath="namstr.f"/>
143 <File RelativePath="nextj.f"/> 142 <File RelativePath="nextj.f"/>
144 <File RelativePath="prompt.f"/> 143 <File RelativePath="prompt.f"/>
145 <File RelativePath="ptover.f"/> 144 <File RelativePath="ptover.f"/>
diff --git a/scilab/modules/core/src/fortran/core_f2c.vcproj b/scilab/modules/core/src/fortran/core_f2c.vcproj
index e41f627..a6085d4 100644
--- a/scilab/modules/core/src/fortran/core_f2c.vcproj
+++ b/scilab/modules/core/src/fortran/core_f2c.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -608,10 +608,6 @@
608 > 608 >
609 </File> 609 </File>
610 <File 610 <File
611 RelativePath=".\namstr.c"
612 >
613 </File>
614 <File
615 RelativePath=".\nextj.c" 611 RelativePath=".\nextj.c"
616 > 612 >
617 </File> 613 </File>
@@ -1104,10 +1100,6 @@
1104 > 1100 >
1105 </File> 1101 </File>
1106 <File 1102 <File
1107 RelativePath=".\namstr.f"
1108 >
1109 </File>
1110 <File
1111 RelativePath=".\nextj.f" 1103 RelativePath=".\nextj.f"
1112 > 1104 >
1113 </File> 1105 </File>