summaryrefslogtreecommitdiffstats
path: root/scilab/modules/core
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-04-22 10:50:02 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-04-22 10:50:02 +0200
commit15098dd94a09b76c93efd72ba739120450950845 (patch)
tree2c61a78ee71c225881f5bc3d7775a0a428fd6021 /scilab/modules/core
parente5c4db103d4d74b8c35146c25d8484a7a74c26a8 (diff)
downloadscilab-15098dd94a09b76c93efd72ba739120450950845.zip
scilab-15098dd94a09b76c93efd72ba739120450950845.tar.gz
fix build windows
Change-Id: I4ad0355d059e47180dcb5f6e622ff2ae426085a0
Diffstat (limited to 'scilab/modules/core')
-rw-r--r--scilab/modules/core/src/cpp/namstr.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scilab/modules/core/src/cpp/namstr.cpp b/scilab/modules/core/src/cpp/namstr.cpp
index f681894..8480d78 100644
--- a/scilab/modules/core/src/cpp/namstr.cpp
+++ b/scilab/modules/core/src/cpp/namstr.cpp
@@ -74,7 +74,11 @@ void C2F(namstr)(int* id,int* str, int* n, char* job)
74 unsigned int j; 74 unsigned int j;
75 /* a full id contains 4 ints from str, so we have *n/4 full ids the remaing are padded with blanks 75 /* a full id contains 4 ints from str, so we have *n/4 full ids the remaing are padded with blanks
76 we can get *n > nlgh (we truncate @ nsiz ids) */ 76 we can get *n > nlgh (we truncate @ nsiz ids) */
77#ifndef _MSC_VER
77 unsigned const int full_ids(std::min(*n/4, nsiz)); 78 unsigned const int full_ids(std::min(*n/4, nsiz));
79#else
80 unsigned const int full_ids(min(*n/4, nsiz));
81#endif
78 82
79 for (j= 0; j!=full_ids; ++j) 83 for (j= 0; j!=full_ids; ++j)
80 { /* str int are signed bytes in fact, we pack them using shifts */ 84 { /* str int are signed bytes in fact, we pack them using shifts */