Move GCC attribute declarations from pref.h.orig to new file

src/libpspp/compiler.h.

In many source files, #include "compiler.h" to get GCC attribute
definitions.

diff --git a/ChangeLog b/ChangeLog
index 22e40403b1ff5f100ba63e67ff2229a638a8bd3d..253804caadeb3a12150f53e8e97f7320ebef92d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  4 12:58:34 2006  Ben Pfaff  <blp@gnu.org>
+
+       * pref.h.orig: Move GCC attribute declarations to
+       new file src/libpspp/compiler.h.
+
 Sat Mar  4 12:27:06 2006  Ben Pfaff  <blp@gnu.org>
 
        * Smake: Require "intprops" gnulib module.

diff --git a/pref.h.orig b/pref.h.orig
index e67f4cf859279e26359fb51db97aca6b8b8b9c88..f2efb834c970a5a2c376176f1b9ed30b8c2d2fc9 100644 (file)
--- a/pref.h.orig
+++ b/pref.h.orig
@@ -1,8 +1,5 @@
 /* -*- C -*- */
 
-/* Used by separable libraries to enable PSPP-specific features. */
-#define PSPP 1
-
 /*
  *
  * Debugging
@@ -19,43 +16,6 @@
 #if !HAVE_LIBPLOT
 #define NO_CHARTS 1
 #endif
-
-/* Define these if DEBUGGING is off and you want to make certain
-   additional optimizations. */
-#if !DEBUGGING
-/* #define NDEBUG 1 */                 /* disable assert() sanity checks */
-#endif
-\f
-/* Compilers. */
-
-/* Use proper keywords. */
-#if __GNUC__ > 1 && !defined (inline)
-#define inline __inline__
-#endif
-
-/* GNU C allows the programmer to declare that certain functions take
-   printf-like arguments, never return, etc.  Conditionalize these
-   declarations on whether gcc is in use. */
-#if __GNUC__ > 1
-#define ATTRIBUTE(X) __attribute__ (X)
-
-/* Only necessary because of a wart in gnulib's xalloc.h. */
-#define __attribute__(X) __attribute__ (X)
-#else
-#define ATTRIBUTE(X)
-#endif
-
-#define UNUSED ATTRIBUTE ((unused))
-#define NO_RETURN ATTRIBUTE ((noreturn))
-#define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (printf, FMT, FIRST)))
-#define SCANF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (scanf, FMT, FIRST)))
-
-/* This attribute was added late in the GCC 2.x cycle. */
-#if __GNUC__ > 2
-#define MALLOC_LIKE ATTRIBUTE ((malloc))
-#else
-#define MALLOC_LIKE
-#endif
 \f
 /* Filesystems. */
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 1cf3b3e5ad3bf7db45913c0ac2a1534bb55a2bee..888271fa935fc95a03b321d94dad40aec25bd427 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  4 12:59:08 2006  Ben Pfaff  <blp@gnu.org>
+
+       * In many source files, #include "compiler.h" to get GCC attribute
+       definitions.
+
 Sat Mar  4 12:28:09 2006  Ben Pfaff  <blp@gnu.org>
 
        * In many source files, replace INT_DIGITS by

diff --git a/src/data/casefile.c b/src/data/casefile.c
index 63b0fcd3b692ba41e06dd1a0ad6086918c3e1f63..ef900e53f231c63e8831d369e9f5772cf06813ba 100644 (file)
--- a/src/data/casefile.c
+++ b/src/data/casefile.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include "alloc.h"
 #include "case.h"
+#include "compiler.h"
 #include "message.h"
 #include "full-read.h"
 #include "full-write.h"

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 1502417be5d048343e0106a9d9f445ab0626a1fe..aa8041d8a814b58c9dd11f94f509885a56c0585e 100644 (file)
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -29,6 +29,7 @@
 #include <stdbool.h>
 #include "message.h"
 #include "calendar.h"
+#include "compiler.h"
 #include "identifier.h"
 #include "magic.h"
 #include "misc.h"

diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index e0afe9bce22b88bdbb7ce62ad949abce9478474b..de529d6798d080aa1ee0f3bac6bc8577c18aedf0 100644 (file)
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -26,6 +26,7 @@
 #include "case.h"
 #include "category.h"
 #include "cat-routines.h"
+#include "compiler.h"
 #include "message.h"
 #include "hash.h"
 #include "misc.h"

diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c
index 25f26c9f7f14176da00bc1749ef40256cf083140..5ece4486989889f6537bcc4d37ba27a6fa55df98 100644 (file)
--- a/src/data/file-handle-def.c
+++ b/src/data/file-handle-def.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "filename.h"
 #include "message.h"
 #include "magic.h"

diff --git a/src/data/format.c b/src/data/format.c
index e88df4633b69e7cb186486d495360bc76957fa8b..d3899b43996642d06532e769b454383ccea1cd05 100644 (file)
--- a/src/data/format.c
+++ b/src/data/format.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 #include "message.h"
 #include <stdlib.h>
+#include "compiler.h"
 #include "misc.h"
 #include "identifier.h"
 #include "str.h"

diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index db33acf035749b940a69c13ea04d9276beca101e..1ee598873ed89edff4d6b099a7ff6b2b21c74036 100644 (file)
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -32,6 +32,7 @@
 #include "alloc.h"
 #include <stdbool.h>
 #include "case.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "file-handle-def.h"
 #include "format.h"

diff --git a/src/data/sfm-private.h b/src/data/sfm-private.h
index c127b85e71c5b366123e564df1fdb9c3cc74043b..9e691e7875a2c51542d8b22f9b9854b316ee80a6 100644 (file)
--- a/src/data/sfm-private.h
+++ b/src/data/sfm-private.h
@@ -20,6 +20,8 @@
 /* PORTME: There might easily be alignment problems with some of these
    structures. */
 
+#include "compiler.h"
+
 /* This attribute might avoid some problems.  On the other hand... */
 #define P ATTRIBUTE ((packed))
 

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 9a3faf6a7d2722cdb36b741a6f06e023cb58f518..71fd6814ba544dc120d87741c66894b6e05eedbf 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -28,6 +28,7 @@
 #include <setjmp.h>
 #include "alloc.h"
 #include "case.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "file-handle-def.h"

diff --git a/src/data/value-labels.c b/src/data/value-labels.c
index 4638bd3fe6038387da8650acce2eff754e5e36c7..dc18a707f6b9c4274aefe3b9fad5f0ef2ed14f3f 100644 (file)
--- a/src/data/value-labels.c
+++ b/src/data/value-labels.c
@@ -22,6 +22,7 @@
 #include "message.h"
 #include <stdlib.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "hash.h"
 #include "str.h"
 

diff --git a/src/data/variable.c b/src/data/variable.c
index 24363996dd2695120841454c61cb51119d1b0289..30ef24caa6ddf7cb772f158903a98d50cf0549fd 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -22,6 +22,7 @@
 #include "message.h"
 #include <stdlib.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "hash.h"
 #include "identifier.h"

diff --git a/src/language/command.c b/src/language/command.c
index 950d801f00b2c1ef5ef8ffcb45a69002771f5b17..397097ab70e40c6bba4410f41079fe4688ca8fbd 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "lexer.h"

diff --git a/src/language/control/control-stack.c b/src/language/control/control-stack.c
index 9f1502c2b188f60886919c29beb75426c1cbf478..43f90e33bd24efb442c4462a768ce934a1a0e834 100644 (file)
--- a/src/language/control/control-stack.c
+++ b/src/language/control/control-stack.c
@@ -2,6 +2,7 @@
 #include "control-stack.h"
 #include <assert.h>
 #include <stdlib.h>
+#include "compiler.h"
 #include "message.h"
 #include "xalloc.h"
 

diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c
index 35e59599e5c8986f7cabb95b67160ccb5b93754a..dc39e66d4db01214c5c174bf83ddbe879dd47bee 100644 (file)
--- a/src/language/control/do-if.c
+++ b/src/language/control/do-if.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include "alloc.h"
 #include "command.h"
+#include "compiler.h"
 #include "message.h"
 #include "expressions/public.h"
 #include "lexer.h"

diff --git a/src/language/control/loop.c b/src/language/control/loop.c
index a4d0e49ca042ab9f628e014f49df0041d22bfa1a..ff38ba5f042bcfbbc4ee84e734f2a822ab35a874 100644 (file)
--- a/src/language/control/loop.c
+++ b/src/language/control/loop.c
@@ -22,6 +22,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "control-stack.h"
 #include "message.h"

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 59830347009e5005ffd5264f274b18d69a873f67..cd22d0cda484e0412a6b1c9a2cc7516da6fde1f2 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -27,6 +27,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "data-in.h"
 #include "debug-print.h"
 #include "data-reader.h"

diff --git a/src/language/data-io/file-type.c b/src/language/data-io/file-type.c
index a021dd5773e5d427f07324bab7fcc068a6db1c8a..6a7e7cc2e2b815d82f6e5b966e56079ab3b29c91 100644 (file)
--- a/src/language/data-io/file-type.c
+++ b/src/language/data-io/file-type.c
@@ -22,6 +22,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "data-in.h"
 #include "data-reader.h"
 #include "dictionary.h"

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index c6ae3ed3090f6e3f2a0aa5a8edd11e63b89173cb..df31b11d119a505f36038bc4645b3baf84751687 100644 (file)
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -25,6 +25,7 @@
 #include "any-writer.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "file-handle.h"

diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c
index 99bfb23bca7b83bf0abb9bbce91b948764bfec94..875a6fdc9c482e3030b93b8a7049d2bb5cff36da 100644 (file)
--- a/src/language/data-io/inpt-pgm.c
+++ b/src/language/data-io/inpt-pgm.c
@@ -24,6 +24,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "data-list.h"
 #include "data-reader.h"
 #include "dictionary.h"

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index 18b08feee5ca3fde496d84c642bda2974b604d77..77080a563825eae535db1f1687f65a04f823f375 100644 (file)
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -24,6 +24,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "intprops.h"
 #include "lexer.h"

diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c
index 343e96dc2231fe048412750669d9253e562b5427..47281defa3bce9be7da93db0e21ee726834e620d 100644 (file)
--- a/src/language/data-io/matrix-data.c
+++ b/src/language/data-io/matrix-data.c
@@ -26,6 +26,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "data-in.h"
 #include "data-reader.h"
 #include "dictionary.h"

diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c
index f5e857e305b4cfebbd198654a593c9c699b6ced7..2399de799c2d392d9d59ee9c41f6ebfd629cd9db 100644 (file)
--- a/src/language/data-io/print.c
+++ b/src/language/data-io/print.c
@@ -25,6 +25,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "data-writer.h"
 #include "message.h"
 #include "expressions/public.h"

diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index fc91894eee2f14bf326a32a602016d9cc21d0529..6ead73dc318e01c848b09a739596ab92036f8f45 100644 (file)
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -24,6 +24,7 @@
 #include "alloc.h"
 #include "bit-vector.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "hash.h"

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index e3813fd2cf85fbee2ae146219d525d47dce3fa40..54e56bbdb1873e1e0d305cc85fca9fb32092e5a5 100644 (file)
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -10,6 +10,7 @@
 #include <math.h>
 #include <stdbool.h>
 #include "case.h"
+#include "compiler.h"
 #include "data-in.h"
 #include "dictionary.h"
 #include "message.h"

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index 73788706748d3dbd91baf563578d4f62409e3b3c..acf08db8f1d72ce61ea280e00a8fa8902343edcc 100644 (file)
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -28,6 +28,7 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include "compiler.h"
 #include "str.h"
 
 

diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c
index 1ab48b93e32417fe4a87f4e2e9a450d9b306e7d5..1aea061f5af3f6e45b893245aeceb9a51b418bf5 100644 (file)
--- a/src/language/stats/autorecode.c
+++ b/src/language/stats/autorecode.c
@@ -23,6 +23,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "hash.h"

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index db1b65be9b4379c5f6388c7508a7fc13dbbdb59c..59f06e48d08ac9ed42df89069512d36d102643a2 100644 (file)
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "file-handle-def.h"
 #include "command.h"

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index 1a6d5691bf9412cdb8214c55d59a218017156451..18eb26ec3fdc2ec0c55be2efe9bdd8743d2d13e4 100644 (file)
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -42,6 +42,7 @@
 #include "hash.h"
 #include "pool.h"
 #include "command.h"
+#include "compiler.h"
 #include "lexer.h"
 #include "message.h"
 #include "magic.h"

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index fb89e90f808292ef7ddb5e664bf1985dca8d81d9..6704fe5d2408db4ff920e3f82e2c38e1ae3d7d63 100644 (file)
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -29,6 +29,7 @@
 #include "case.h"
 #include "casefile.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "lexer.h"
 #include "message.h"

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index 940a4391fc733734a91965f4f988ce8a1a6b7142..14981e884e0469ae3c2ab080904684cc13ca7608 100644 (file)
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "case.h"
 #include "dictionary.h"
 #include "command.h"
+#include "compiler.h"
 #include "lexer.h"
 #include "message.h"
 #include "magic.h"

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index c3b3a497de24d5d03e6d196a3144bd0fab0da5cf..0bc6b555aed9239f7284fbb6d61529bf65277ae4 100644 (file)
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -32,6 +32,7 @@
 #include "alloc.h"
 #include "bit-vector.h"
 #include "case.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "hash.h"
 #include "pool.h"

diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q
index 9cdb7db5a098bb868fa72c8d89ed961956687d37..6c745cd15367fdab19724bc6e63a57b77ed25a2e 100644 (file)
--- a/src/language/stats/oneway.q
+++ b/src/language/stats/oneway.q
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "case.h"
 #include "dictionary.h"
 #include "command.h"
+#include "compiler.h"
 #include "lexer.h"
 #include "message.h"
 #include "magic.h"

diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q
index db1feea53e6c57692ac68ab9b5365c5999775a91..a138fc8f75dac40b028d5cb48421e377667621c7 100644 (file)
--- a/src/language/stats/rank.q
+++ b/src/language/stats/rank.q
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include <config.h>
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "sort.h"
 #include "variable.h"

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 1459628cb6c9c5d8c8a5225c40d05100f351758c..874e7bc2a145ae320570c83367c5586b8f1c7b21 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -29,6 +29,7 @@
 #include "category.h"
 #include "cat-routines.h"
 #include "command.h"
+#include "compiler.h"
 #include "design-matrix.h"
 #include "dictionary.h"
 #include "message.h"

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index d0fff3fd0cb4505ecdaa801bf248fbde829c6415..fac23714fe577496155c169b129a4ed216c7f652 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -29,6 +29,7 @@
 #include "case.h"
 #include "casefile.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "group-proc.h"

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index b6b3963a715d702157b91edbfe424390be6e6d64..23559589dd2744a211e9d3f828be3413237ea220 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -26,6 +26,7 @@
 #include <time.h>
 #include "alloc.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "line-buffer.h"
 #include "lexer.h"

diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c
index e5f3991a620c14c073f99203deb30fb55c1e3fc0..43576235284a34109afb7956c9d5b0dad2b99b48 100644 (file)
--- a/src/language/xforms/count.c
+++ b/src/language/xforms/count.c
@@ -23,6 +23,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "lexer.h"

diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c
index 7da3ab3a48dde46d6c9484e0a0f7e6bbdfdd5575..38bb5508e1260149e54b02a1d4b71d4eb80c75f2 100644 (file)
--- a/src/language/xforms/recode.c
+++ b/src/language/xforms/recode.c
@@ -25,6 +25,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "compiler.h"
 #include "data-in.h"
 #include "dictionary.h"
 #include "message.h"

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index 0635caa9310c6094d86aca8164e2e3fc539acb5c..f0bfab98e4f49b73c41649d84437d33ea0ff5af6 100644 (file)
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -24,6 +24,7 @@
 #include <math.h>
 #include "alloc.h"
 #include "command.h"
+#include "compiler.h"
 #include "message.h"
 #include "lexer.h"
 #include "random.h"

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index e78ba849c650b4481223928aa684ded67bda8175..dea90675adb248f1d2883e0cddab51160e483854 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar  4 12:59:01 2006  Ben Pfaff  <blp@gnu.org>
+
+       * compiler.h: New file.
+
 Sat Mar  4 11:55:16 2006  Ben Pfaff  <blp@gnu.org>
 
        * str.h: Now assume that sprintf() returns the correct value.

diff --git a/src/libpspp/compiler.h b/src/libpspp/compiler.h
new file mode 100644 (file)
index 0000000..44f22b3
--- /dev/null
+++ b/src/libpspp/compiler.h
@@ -0,0 +1,47 @@
+/* PSPP - computes sample statistics.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Ben Pfaff <blp@gnu.org>.
+
+   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 the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
+
+#ifndef COMPILER_H
+#define COMPILER_H 1
+
+/* GNU C allows the programmer to declare that certain functions take
+   printf-like arguments, never return, etc.  Conditionalize these
+   declarations on whether gcc is in use. */
+#if __GNUC__ > 1
+#define ATTRIBUTE(X) __attribute__ (X)
+
+/* Only necessary because of a wart in gnulib's xalloc.h. */
+#define __attribute__(X) __attribute__ (X)
+#else
+#define ATTRIBUTE(X)
+#endif
+
+#define UNUSED ATTRIBUTE ((unused))
+#define NO_RETURN ATTRIBUTE ((noreturn))
+#define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (printf, FMT, FIRST)))
+#define SCANF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (scanf, FMT, FIRST)))
+
+/* This attribute was added late in the GCC 2.x cycle. */
+#if __GNUC__ > 2
+#define MALLOC_LIKE ATTRIBUTE ((malloc))
+#else
+#define MALLOC_LIKE
+#endif
+
+#endif /* compiler.h */

diff --git a/src/libpspp/hash.c b/src/libpspp/hash.c
index 76503664f016816cdd0ac49e9b5bd31ebb8eeed8..fcf2b1f9634452c7c079948b21e0b77d3a7df0ba 100644 (file)
--- a/src/libpspp/hash.c
+++ b/src/libpspp/hash.c
@@ -23,10 +23,11 @@
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include "array.h"
 #include "alloc.h"
-#include <stdbool.h>
+#include "compiler.h"
 #include "misc.h"
 #include "str.h"
 

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 8f86d0a8f834110125bacf11da16f51c47ba3994..7505f7b0809641a71cf19322f5a59db1df13bda1 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -22,6 +22,7 @@
 
 #include <stdarg.h>
 #include <stdbool.h>
+#include "compiler.h"
 
 /* Message classes. */
 enum

diff --git a/src/libpspp/pool.h b/src/libpspp/pool.h
index daa866b356110fbc74f4ec313047b1bad8782d14..4f33dfa0d09a888bc3c0e2763f48968704850de9 100644 (file)
--- a/src/libpspp/pool.h
+++ b/src/libpspp/pool.h
@@ -21,6 +21,7 @@
 #define pool_h 1
 
 #include <stdio.h>
+#include "compiler.h"
 
 /* Maximum size of a suballocated block.  Larger blocks are allocated
    directly with malloc() to avoid memory wastage at the end of a

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 0b50b0310ee2d166a99d8340427f42b7ac27ee98..7773db022ca69fb54cb0a9a53c3e739330794604 100644 (file)
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "compiler.h"
 #include "memcasecmp.h"
 #include "memmem.h"
 #include "snprintf.h"

diff --git a/src/math/group.c b/src/math/group.c
index 58d5c9295d377c0f7d3eaff7877a363f91c103fa..07803183fee58e04679e0ffe51dcba82a054e8c8 100644 (file)
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "hash.h"
 #include "group.h"
 #include "group-proc.h"

diff --git a/src/math/percentiles.c b/src/math/percentiles.c
index 4d7b148147d0af97f488d6a0e080813dceb720bd..372bd4ca08bfd2dedc38c116e3f3cdf11c5da41d 100644 (file)
--- a/src/math/percentiles.c
+++ b/src/math/percentiles.c
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <config.h>
+#include "compiler.h"
 #include "factor-stats.h"
 #include "percentiles.h"
 #include "misc.h"

diff --git a/src/output/ascii.c b/src/output/ascii.c
index ffe0c0452a9c77e372bace6f825483dd3aff4a20..305100afe9eb9ee41ee879915e770caf5874abe1 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -26,6 +26,7 @@
 #include "alloc.h"
 #include "message.h"
 #include "chart.h"
+#include "compiler.h"
 #include "filename.h"
 #include "misc.h"
 #include "output.h"

diff --git a/src/output/charts/cartesian.c b/src/output/charts/cartesian.c
index 1350a155de8e8f756b45fa813c6d14fe094f82b0..2a9b1c5fcbbf33f30bf00e28cf53f59d39531ad5 100644 (file)
--- a/src/output/charts/cartesian.c
+++ b/src/output/charts/cartesian.c
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include "plot-chart.h"
 #include "cartesian.h"
+#include "compiler.h"
 
 
 

diff --git a/src/output/charts/dummy-chart.c b/src/output/charts/dummy-chart.c
index 963015e6be772b200c993a1adf3da6e7cdf38ed3..a255f23795d254b8527ff42a129e3842f25c5392 100644 (file)
--- a/src/output/charts/dummy-chart.c
+++ b/src/output/charts/dummy-chart.c
@@ -26,6 +26,7 @@
 #include "plot-chart.h"
 #include "cartesian.h"
 #include <gsl/gsl_histogram.h>
+#include "compiler.h"
 
 
 #ifndef NO_CHARTS

diff --git a/src/output/groff-font.c b/src/output/groff-font.c
index c8014d78ea2f3a36352448180cefd4c978983f15..5b651c4a8228b203b13729c81de73cbfc5de4ae3 100644 (file)
--- a/src/output/groff-font.c
+++ b/src/output/groff-font.c
@@ -26,6 +26,7 @@
 #include <limits.h>
 #include <stdarg.h>
 #include "alloc.h"
+#include "compiler.h"
 #include "message.h"
 #include "filename.h"
 #include "getline.h"

diff --git a/src/output/html.c b/src/output/html.c
index 901c98a2a09b4ac61cd4b06bab2cb7ae604de056..50561df7c4cc33ea289b55ed1def861cd669f694 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "alloc.h"
+#include "compiler.h"
 #include "message.h"
 #include "filename.h"
 #include "getline.h"

diff --git a/src/output/postscript.c b/src/output/postscript.c
index f54ef1684f222ced82d22140d2c636c173748528..754559ca42569ee2d434f5c183a3e9507da7c61b 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -36,6 +36,7 @@
 
 #include "alloc.h"
 #include "bit-vector.h"
+#include "compiler.h"
 #include "message.h"
 #include "filename.h"
 #include "font.h"

diff --git a/src/output/table.c b/src/output/table.c
index 45af6411fdc9f27334146e33707e3769c485028b..4a8e036e25af1c79aaec1b3e5dae5ae523b308cb 100644 (file)
--- a/src/output/table.c
+++ b/src/output/table.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include "message.h"
 #include "alloc.h"
+#include "compiler.h"
 #include "format.h"
 #include "magic.h"
 #include "misc.h"

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 0a09cda97c71d27200f2802fd2a53804f04c0847..7712df83d903cb81c578a9fbdee5f1ad0b52e97e 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include "command-line.h"
 #include "command.h"
+#include "compiler.h"
 #include "dictionary.h"
 #include "message.h"
 #include "file-handle-def.h"