patch-2.2.16 linux/include/asm-alpha/string.h

Next file: linux/include/asm-alpha/system.h
Previous file: linux/include/asm-alpha/pgtable.h
Back to the patch index
Back to the overall index

diff -urN v2.2.15/linux/include/asm-alpha/string.h linux/include/asm-alpha/string.h
@@ -14,7 +14,7 @@
 /* For backward compatibility with modules.  Unused otherwise.  */
 extern void * __memcpy(void *, const void *, size_t);
 
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
 #define memcpy __builtin_memcpy
 #endif
 
@@ -22,7 +22,7 @@
 extern void * __constant_c_memset(void *, unsigned long, size_t);
 extern void * __memset(void *, int, size_t);
 
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
 #define memset(s, c, n)							    \
 (__builtin_constant_p(c)						    \
  ? (__builtin_constant_p(n) && (c) == 0					    \

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)