X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fcompiler.h;h=6ce8f1aecb41f89e94f48ca3a0b03b9db42f68cc;hb=0c5a40350a72440f1745f70c5bd15d4b87d2238f;hp=07b36b8e24d0eb9266c7dfbdc82f6bf6b69f61d0;hpb=481ee9c1ac4e7adf004313e689830b7052e61429;p=pspp

diff --git a/src/libpspp/compiler.h b/src/libpspp/compiler.h
index 07b36b8e24..6ce8f1aecb 100644
--- a/src/libpspp/compiler.h
+++ b/src/libpspp/compiler.h
@@ -38,7 +38,11 @@
 /* Mark a function as taking a printf- or scanf-like format
    string as its FMT'th argument and that the FIRST'th argument
    is the first one to be checked against the format string. */
+#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__>= 4) || __GNUC__ > 4)
+#define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (gnu_printf, FMT, FIRST)))
+#else
 #define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (__printf__, FMT, FIRST)))
+#endif
 #define SCANF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (__scanf__, FMT, FIRST)))
 
 /* Tells the compiler that a function may be treated as if any
@@ -91,7 +95,7 @@
 /* This attribute indicates that the function should be compiled
    with the specified LEVEL, regardless of what has been specified
    on the command line */
-#if __GNUC__ > 3
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 4)
 #define OPTIMIZE(LEVEL) ATTRIBUTE ((optimize(LEVEL)))
 #else
 #define OPTIMIZE(LEVEL)