Changeset 347 for ps

Timestamp:

06/02/04 17:00:23 (21 years ago)

Author:

janwas

Message:

fixed gcc error with asm code

Location:

ps/trunk/source/lib

Files:

• config.h (modified) (2 diffs)
• memcpy.cpp (modified) (3 diffs)

ps/trunk/source/lib/config.h

@@ -14 +14 @@
 
 
-// HAVE_C99: check if compiler advertises support for C99
-// (make sure it's #defined before testing value to avoid ICC warning)
-#undef HAVE_C99
-#ifdef __STDC_VERSION__
-# if __STDC_VERSION__ >= 199901L
-#  define HAVE_C99
-# endif
-#endif
+#undef HAVE_C99     // compiler advertises support for C99
+
+#undef HAVE_ASM
 
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_X
+
+#undef CONFIG_DISABLE_EXCEPTIONS
+
+
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+# define HAVE_C99
+#endif
+
+#ifdef _MSC_VER
+# define HAVE_ASM
+#endif
 
 #ifdef OS_UNIX
@@ -34 +40 @@
 #endif
 
-#undef CONFIG_DISABLE_EXCEPTIONS
+

ps/trunk/source/lib/memcpy.cpp

@@ -6 +6 @@
 
 #include "precompiled.h"
+#include "config.h"
 
-#if _MSC_VER >= 0x1300
+#ifdef HAVE_ASM
 
 void memcpy_nt(void* dst, void* src, int len)
@@ -30 +31 @@
     mov         eax, [esi-128]
     sub         esi, 128
-    test        esi, 4095                   ; CHUNK_SIZE-1 (icc doesn't preprocess asm)
+    test        esi, 4095                   ; CHUNK_SIZE-1 (icc doesnt preprocess asm)
     jnz         prefetch_loop
 
@@ -67 +68 @@
 }
 
-#endif  // #if _MSC_VER >= 0x1300
+#endif  // #ifdef HAVE_ASM