Warning conditions on win32 fixed
authorgreg
Fri, 05 Dec 2008 16:22:15 +0100
changeset 156 6b16b7f8b527
parent 155 e094c92cf197
child 157 3e12726f9d6b
Warning conditions on win32 fixed
lib/iec_std_lib.h
--- a/lib/iec_std_lib.h	Thu Dec 04 13:09:18 2008 +0100
+++ b/lib/iec_std_lib.h	Fri Dec 05 16:22:15 2008 +0100
@@ -926,7 +926,7 @@
 /**************/
 #define __shift_(fname, TYPENAME, OP)\
 static inline TYPENAME fname##TYPENAME(EN_ENO_PARAMS, TYPENAME IN, USINT N) {\
-  TEST_EN_COND(TYPENAME, N < 0)\
+  TEST_EN(TYPENAME)\
   return IN OP N;\
 }
 
@@ -940,7 +940,7 @@
 
 #define __ror_(TYPENAME)\
 static inline TYPENAME __ror_##TYPENAME(EN_ENO_PARAMS, TYPENAME IN, USINT N){\
-  TEST_EN_COND(TYPENAME, N < 0)\
+  TEST_EN(TYPENAME)\
   N %= 8*sizeof(TYPENAME);\
   return (IN >> N) | (IN << 8*sizeof(TYPENAME)-N);\
 }
@@ -949,7 +949,7 @@
 
 #define __rol_(TYPENAME)\
 static inline TYPENAME __rol_##TYPENAME(EN_ENO_PARAMS, TYPENAME IN, USINT N){\
-  TEST_EN_COND(TYPENAME, N < 0)\
+  TEST_EN(TYPENAME)\
   N %= 8*sizeof(TYPENAME);\
   return (IN << N) | (IN >> 8*sizeof(TYPENAME)-N);\
 }
@@ -1054,7 +1054,7 @@
     /**************/
 #define __mux_(TYPENAME) \
 static inline TYPENAME __mux_##TYPENAME(EN_ENO_PARAMS, UINT param_count, UINT K, ...){\
-  TEST_EN_COND(TYPENAME, K < 0 || K >= param_count)\
+  TEST_EN_COND(TYPENAME, K >= param_count)\
   va_list ap;\
   UINT i;\
   TYPENAME tmp = __INIT_##TYPENAME;\