compiler: Fix test for "optimize" attribute.

[pspp] / src / libpspp / compiler.h

diff --git a/src/libpspp/compiler.h b/src/libpspp/compiler.h
index 563cc59b1e85b8a6d7d44bdba3e9414e4d17603d..b5d02466dcb7c1ddf602e3fe927303e86251399b 100644 (file)
--- a/src/libpspp/compiler.h
+++ b/src/libpspp/compiler.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@
    non-`NULL' pointer it returns cannot alias any other pointer
    valid when the function returns. */
 #if __GNUC__ > 2
-#define MALLOC_LIKE ATTRIBUTE ((malloc))
+#define MALLOC_LIKE ATTRIBUTE ((__malloc__))
 #else
 #define MALLOC_LIKE
 #endif
@@ -77,4 +77,25 @@
 #define PURE_FUNCTION
 #endif
 
+/* This attribute indicates that the argument with the given
+   IDX must be a null pointer.  IDX counts backward in the
+   argument list, so that 0 is the last argument, 1 is the
+   second-from-last argument, and so on. */
+#if __GNUC__ > 3
+#define SENTINEL(IDX) ATTRIBUTE ((sentinel(IDX)))
+#else
+#define SENTINEL(IDX)
+#endif
+
+
+/* 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__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 4)
+#define OPTIMIZE(LEVEL) ATTRIBUTE ((optimize(LEVEL)))
+#else
+#define OPTIMIZE(LEVEL)
+#endif
+
+
 #endif /* compiler.h */