xalloc.h-instead-of-alloc.h.patch from patch #6230.

Removes src/libpspp/alloc.[ch] and changes users to include "xalloc.h"
from gnulib instead.

diff --git a/src/data/case-map.c b/src/data/case-map.c
index a1a65cc181564e784ab4d8a7f2b230501cf0fcc1..7a91f497ca9e66f7f5c76fbf9a5d5cd1653b016a 100644 (file)
--- a/src/data/case-map.c
+++ b/src/data/case-map.c
@@ -19,13 +19,15 @@
 #include <data/case-map.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <data/dictionary.h>
 #include <data/variable.h>
 #include <data/case.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 
+#include "xalloc.h"
+
 /* A case map. */
 struct case_map
   {

diff --git a/src/data/case.c b/src/data/case.c
index 4b8c79dee8bc03dafbd641d8c12536c6635b4b04..cec6f21e1be8ae94ccd7dcbc2284841e91ec9cab 100644 (file)
--- a/src/data/case.c
+++ b/src/data/case.c
@@ -24,10 +24,10 @@
 
 #include <data/value.h>
 #include <data/variable.h>
-#include <libpspp/alloc.h>
 #include <libpspp/str.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 /* Reference-counted case implementation. */
 struct case_data

diff --git a/src/data/category.c b/src/data/category.c
index 835c0907bcfc48cb40a5faebee9246be973352c8..b0424d9f65c054df4631897702d33ab4eae1c57a 100644 (file)
--- a/src/data/category.c
+++ b/src/data/category.c
@@ -34,12 +34,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include "category.h"
 #include "value.h"
 #include "variable.h"
 
+#include "xalloc.h"
+
 #define CAT_VALUE_NOT_FOUND -2
 
 #define N_INITIAL_CATEGORIES 1

diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index 5d6633bd7ad61e98f4288a9f88e797486c2efd49..32e9840b0692025b419b4ef473893621245b004e 100644 (file)
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -28,7 +28,6 @@
 #include "vardict.h"
 #include "variable.h"
 #include "vector.h"
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
@@ -38,6 +37,7 @@
 #include <libpspp/str.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c
index 59195e91bdfa676548d6951d809068f2364f84ce..1dea25a5f0480b55a0c93e39e5aebc2d1ced2bf0 100644 (file)
--- a/src/data/file-handle-def.c
+++ b/src/data/file-handle-def.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
@@ -31,6 +30,8 @@
 #include <data/variable.h>
 #include <data/scratch-handle.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/data/make-file.c b/src/data/make-file.c
index 3225d2ca50a118523df400b8d05d8bf8c858e45f..051905b821ad0fbd3ec5a8329c8e817be6550816 100644 (file)
--- a/src/data/make-file.c
+++ b/src/data/make-file.c
@@ -23,7 +23,8 @@
 #include "file-name.h"
 #include "make-file.h"
 #include <libpspp/message.h>
-#include <libpspp/alloc.h>
+
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index 9977158ee1991a0687304ba70c2e8ab94b85a3ce..4636d5fb806cf82b81124f0515c96a9f89feb965 100644 (file)
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -35,7 +35,6 @@
 #include <data/missing-values.h>
 #include <data/value-labels.h>
 #include <data/variable.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
@@ -43,6 +42,8 @@
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c
index cfb9c30362837067136d24e1db34e6d84e2a8d64..111043a8a1e83e2b321ae586e18242892565de42 100644 (file)
--- a/src/data/por-file-writer.c
+++ b/src/data/por-file-writer.c
@@ -38,13 +38,14 @@
 #include <data/value-labels.h>
 #include <data/variable.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 #include <libpspp/version.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/data/procedure.c b/src/data/procedure.c
index f280b6828a314b20a7e6a3c912fcab9f29da23d5..e446a659b907e14680e9cf20e0f2415ea201436a 100644 (file)
--- a/src/data/procedure.c
+++ b/src/data/procedure.c
@@ -32,12 +32,12 @@
 #include <data/procedure.h>
 #include <data/transformations.h>
 #include <data/variable.h>
-#include <libpspp/alloc.h>
 #include <libpspp/deque.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 #include <libpspp/taint.h>
 
+#include "xalloc.h"
 
 struct dataset {
   /* Cases are read from source,

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 6900c2cc804b378eaaef5bd7cafd50d902a9bd29..baa0c0e617d048dc64a791693c4bd476f5294bb3 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -25,7 +25,6 @@
 #include <setjmp.h>
 #include <stdlib.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/compiler.h>
@@ -51,6 +50,7 @@
 #include "inttostr.h"
 #include "minmax.h"
 #include "unlocked-io.h"
+#include "xalloc.h"
 #include "xsize.h"
 
 #include "gettext.h"

diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
index b21053c216a54c5fa3181d161d6cd795ec5ed0d0..a20b9fc1138244286834358df7ed09341a6f5bef 100644 (file)
--- a/src/data/sys-file-writer.c
+++ b/src/data/sys-file-writer.c
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/float-format.h>
 #include <libpspp/integer-format.h>
 #include <libpspp/message.h>
@@ -49,6 +48,7 @@
 
 #include "minmax.h"
 #include "unlocked-io.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/value-labels.c b/src/data/value-labels.c
index 5a42ea3c9a8a99a3141cd0d1752f965a1a0c761d..b9acc2bda59ffb8a199efafc425a852afb2ec55f 100644 (file)
--- a/src/data/value-labels.c
+++ b/src/data/value-labels.c
@@ -24,12 +24,13 @@
 #include <data/format.h>
 #include <data/value.h>
 #include <data/variable.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 static hsh_compare_func compare_int_val_lab;
 static hsh_hash_func hash_int_val_lab;
 static hsh_free_func free_int_val_lab;

diff --git a/src/data/variable.c b/src/data/variable.c
index b3b34be0c93f38aeb7619f8570197854dab72fd4..4a2e44057c70c23aeff99d17ee206cc205ad5105 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -29,13 +29,14 @@
 #include "vardict.h"
 
 #include <libpspp/misc.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c
index 2e1e0abf5f4deb412db249189cb489b298f72e0d..61c450a52359b76683a5c7f9c6ca926801c8c032 100644 (file)
--- a/src/language/control/do-if.c
+++ b/src/language/control/do-if.c
@@ -26,12 +26,12 @@
 #include <language/command.h>
 #include <language/expressions/public.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
-#include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/control/loop.c b/src/language/control/loop.c
index 1edbf25c1b7bc9cd405b3f09f45e38e00071ae22..20cf69e5d9ce2abbeb14daa126909a57efb2eb32 100644 (file)
--- a/src/language/control/loop.c
+++ b/src/language/control/loop.c
@@ -26,13 +26,14 @@
 #include <language/command.h>
 #include <language/expressions/public.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c
index cd56d7c81164c44103693c5e3da2a7083be584b1..e518d51e112885bd3a7fae6d0537da5599bd10f8 100644 (file)
--- a/src/language/control/repeat.c
+++ b/src/language/control/repeat.c
@@ -29,7 +29,6 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/ll.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
@@ -38,6 +37,7 @@
 #include <data/variable.h>
 
 #include "intprops.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c
index b00641418a35a639f40f139409a27dc9d4a25da7..2f8b4023c9c7a58765212c774cc357e891397fc0 100644 (file)
--- a/src/language/control/temporary.c
+++ b/src/language/control/temporary.c
@@ -27,12 +27,12 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
-#include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 75db52af6548f61baa214f9250856778565fb53b..61f8d8bde65200e54e3752bfbb00a881016706e7 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -39,7 +39,6 @@
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/ll.h>
@@ -51,6 +50,7 @@
 
 #include "size_max.h"
 #include "xsize.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c
index 7176aed43a03f7c763a86747cf889cc69c9c10e2..12bb43a392745a4db434a1d7185fc5e660f65804 100644 (file)
--- a/src/language/data-io/data-reader.c
+++ b/src/language/data-io/data-reader.c
@@ -31,13 +31,13 @@
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
 #include <language/prompt.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
 #include "minmax.h"
 #include "size_max.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/data-writer.c b/src/language/data-io/data-writer.c
index 0680fc410d0533df8e78b43ea566fea134da8794..55b6737b1351ac3fa4e6cbd01a1f96ced717f95b 100644 (file)
--- a/src/language/data-io/data-writer.c
+++ b/src/language/data-io/data-writer.c
@@ -24,12 +24,12 @@
 
 #include <data/file-name.h>
 #include <language/data-io/file-handle.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index 2e3d8a346c84848b584e16d71cb557e7b1e06a0f..7845ca3337e82d5fdfa000c03e0dd674c38a95d2 100644 (file)
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -19,7 +19,6 @@
 #include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <data/file-name.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
@@ -29,6 +28,8 @@
 #include <data/variable.h>
 #include <data/file-handle-def.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index abfc62472a3b50e11bbf61bfaa5e9ac5c18acf23..e34ea79923191761b46edc2cc085e37992aca419 100644 (file)
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -37,7 +37,6 @@
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
@@ -46,6 +45,8 @@
 #include <libpspp/str.h>
 #include <libpspp/taint.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c
index 59d7bfa72c2d6abcf2fa6a3ff5ac6d4e90e9ba56..844fe2fe75d04efde0c84741fbbc09477509ac26 100644 (file)
--- a/src/language/data-io/inpt-pgm.c
+++ b/src/language/data-io/inpt-pgm.c
@@ -33,7 +33,6 @@
 #include <language/data-io/file-handle.h>
 #include <language/expressions/public.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
@@ -41,6 +40,8 @@
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index 0227c72b1ebb414c4b9f51c19364923a4fad0436..ca69ab25cdf0785851b34c5c8db4c1ca1c26eead 100644 (file)
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -33,7 +33,6 @@
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
@@ -44,6 +43,7 @@
 #include <output/table.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c
index d8f95d4e98368540dd77b017f01512f5d0b4e48c..67dfa1290aab8a1bdd8754b77632e21269500640 100644 (file)
--- a/src/language/data-io/print.c
+++ b/src/language/data-io/print.c
@@ -30,7 +30,6 @@
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/ll.h>
@@ -40,6 +39,8 @@
 #include <output/manager.h>
 #include <output/table.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index c20285fe2c8b09c113cd0bbc9b2ec86350020b0d..d9a72f3549eab1b61086b4322b06b9b44a55fe4c 100644 (file)
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -24,17 +24,17 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/array.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
-#include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c
index 9f2c96e78331c6e5c8b5457c23863f2b74a3cdd2..3179efda3748498090a7a8603165adffc86ae8d7 100644 (file)
--- a/src/language/dictionary/rename-variables.c
+++ b/src/language/dictionary/rename-variables.c
@@ -24,11 +24,12 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c
index 99766287e256000b06254297955931fa1091e581..91c27c9592c39ef9beb3814656808d9fad94487b 100644 (file)
--- a/src/language/dictionary/split-file.c
+++ b/src/language/dictionary/split-file.c
@@ -29,12 +29,13 @@
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <output/manager.h>
 #include <output/table.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 15b7e8596ac6dc064e247aa8f9148527b04b8fe0..48703b4a76f68ef59e0412f23e6324f201a9b352 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -33,7 +33,6 @@
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
@@ -44,6 +43,7 @@
 #include <output/table.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 6af0b62c57aa981175253e0f5dd04f2ad10f9640..4b7c03961783c0109b30c8e5a32bcb13b43658b3 100644 (file)
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -25,11 +25,12 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 \f

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index cf3bad79449adf25cebccfb2830e61d075fc07c2..bada08142561bbb354f09bcc1adb1b764eeefca9 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -24,10 +24,11 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 /* Set variables' alignment
    This is the alignment for GUI display only.
    It affects nothing but GUIs

diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c
index 88b60ad0f4dc624ff33a62480877bbab82a91722..e8abe70dc91fd0c12d1000c5a615e2ce59195604 100644 (file)
--- a/src/language/dictionary/variable-label.c
+++ b/src/language/dictionary/variable-label.c
@@ -24,10 +24,11 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c
index dd5c0cf47befaab278b2f292cc653d2154d888d1..e61ee53a44ce3f04c87d356c065c7c5198cab13c 100644 (file)
--- a/src/language/dictionary/vector.c
+++ b/src/language/dictionary/vector.c
@@ -26,7 +26,6 @@
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
@@ -34,6 +33,7 @@
 #include <libpspp/str.h>
 
 #include "intprops.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 10759b973db58a636567bbe440fe0151b4d7584b..52dafef8c62edd7a939feb6735e18e0e798b1d23 100644 (file)
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -18,13 +18,14 @@
 #include "private.h"
 
 #include <ctype.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include "helpers.h"
 #include "evaluate.h"
 #include <libpspp/pool.h>
 
+#include "xalloc.h"
+
 static void
 expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
                void *result)

diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index df0ab75fe8e533c8bfacf872815dd96047421853..b0abd946c57b9868b6346f77d45d68cf5a45ccc3 100644 (file)
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -20,7 +20,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <data/calendar.h>
 #include <data/data-in.h>
@@ -33,6 +32,8 @@
 #include <libpspp/str.h>
 #include <data/variable.h>
 
+#include "xalloc.h"
+
 static union any_node *evaluate_tree (struct composite_node *,
                                       struct expression *);
 static union any_node *optimize_tree (union any_node *, struct expression *);

diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c
index 073feaf775e93093d2bf57e945ee32f6520f8266..5ae4994484c685362d2daa689e79544c78a9f140 100644 (file)
--- a/src/language/expressions/parse.c
+++ b/src/language/expressions/parse.c
@@ -31,13 +31,14 @@
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
+
+#include "xalloc.h"
 \f
 /* Declarations. */
 

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index 7d5ece79b9cb983c01c7b8d939e15038b7f22125..fb0ddb49679afb087bab9e8a5d296bc827daf596 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -23,7 +23,6 @@
 #include <math.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <language/command.h>
 #include <libpspp/message.h>
@@ -33,6 +32,7 @@
 #include <output/journal.h>
 
 #include "size_max.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index fcb2f5c6487fadee7307c300403f72e47d02f752..60a5790f4f61510433a534815972154d7073d685 100644 (file)
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -2073,7 +2073,6 @@ main (int argc, char *argv[])
          indent = 0;
 
          dump (0, "#include <stdlib.h>");
-         dump (0, "#include <libpspp/alloc.h>");
          dump (0, "#include <libpspp/assertion.h>");
          dump (0, "#include <libpspp/message.h>");
          dump (0, "#include <language/lexer/lexer.h>");
@@ -2084,6 +2083,9 @@ main (int argc, char *argv[])
          dump (0, "#include <data/variable.h>");
          dump (0, nullstr);
 
+          dump (0, "#include \"xalloc.h\"");
+         dump (0, nullstr);
+
           dump (0, "#include \"gettext.h\"");
           dump (0, "#define _(msgid) gettext (msgid)");
          dump (0, nullstr);

diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c
index ed64d0341460315269efd4b9520841e3902b378e..3778156133d38daaadf13251ab568df32ab190fe 100644 (file)
--- a/src/language/lexer/variable-parser.c
+++ b/src/language/lexer/variable-parser.c
@@ -26,7 +26,6 @@
 #include <data/dictionary.h>
 #include <data/procedure.h>
 #include <data/variable.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/hash.h>
@@ -35,6 +34,8 @@
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/prompt.c b/src/language/prompt.c
index 378fa851fb5782dba62a98976f4ac3fdc55535fa..5ecd42fb34fa6b91a2322aecbecc3f400af43f7d 100644 (file)
--- a/src/language/prompt.c
+++ b/src/language/prompt.c
@@ -27,7 +27,6 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
@@ -36,6 +35,8 @@
 #include <libpspp/version.h>
 #include <output/table.h>
 
+#include "xalloc.h"
+
 /* Current prompts in each style. */
 static char *prompts[PROMPT_CNT];
 

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 921c8ed0985ac28fda71f5f96b5754d226a7e618..b464a2890c7285c33474e3f82e2d26356232e912 100644 (file)
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -36,7 +36,6 @@
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
 #include <language/stats/sort-criteria.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
@@ -46,6 +45,7 @@
 #include <math/sort.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c
index b075fb0b70d43bfdbdd0992b994281f788526ebf..8b64ff3df14361247bcaf749c47483e8f00aaa50 100644 (file)
--- a/src/language/stats/autorecode.c
+++ b/src/language/stats/autorecode.c
@@ -26,14 +26,14 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
-#include <libpspp/message.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 1d8d15fc63a3b1d5131c8cfd5045564737f14554..f82647a405b176c5fa95f5ab90c4e864524e6ed4 100644 (file)
--- a/src/language/stats/binomial.c
+++ b/src/language/stats/binomial.c
@@ -17,7 +17,6 @@
 #include <config.h>
 #include <libpspp/compiler.h>
 #include <output/table.h>
-#include <libpspp/alloc.h>
 
 #include <data/case.h>
 #include <data/casereader.h>
@@ -33,6 +32,8 @@
 #include "binomial.h"
 #include "freq.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c
index 1b8392724db880a3fdae76187a9e4b2a08ccbe57..337203f18deff6112f11ec91efb23f1e4b79b35a 100644 (file)
--- a/src/language/stats/chisquare.c
+++ b/src/language/stats/chisquare.c
@@ -29,7 +29,6 @@
 #include <data/variable.h>
 #include <language/stats/freq.h>
 #include <language/stats/npar.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
@@ -39,6 +38,8 @@
 
 #include <gsl/gsl_cdf.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index 0ed9cc3074c8bdfb25a236bb7a792f7d36c27451..540024dbd1f6ee15c98a9deca208b5060b450978 100644 (file)
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -26,9 +26,10 @@
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 
+#include "xalloc.h"
+
 /* (headers) */
 
 struct cor_set

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index 70751495024e6f9767943a25d8349449ee981273..e1ca73bb3111e0b1e0c2a4b7a3d3ebb3ad0f7ec0 100644 (file)
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -30,7 +30,6 @@
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
@@ -39,6 +38,8 @@
 #include <output/manager.h>
 #include <output/table.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index acf14e394dddbdf2968ebf065d6302001b04ec3c..9d7ed136ab083c25fb8de054b47135fd291890b3 100644 (file)
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -32,7 +32,6 @@
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
@@ -47,6 +46,7 @@
 #include <output/table.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c
index 760b2ffc30932d99872516a8d4154dcf919ed84e..2bcd1e4b873212d33f7201c322983afdf6646a90 100644 (file)
--- a/src/language/stats/flip.c
+++ b/src/language/stats/flip.c
@@ -33,7 +33,6 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
@@ -43,6 +42,7 @@
 
 #include "intprops.h"
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index 681d2161f10c85c29c647449e01ef424db9eb1a4..ce313678db2591d78dc6ab186cb8f8f48beb5aae 100644 (file)
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -38,7 +38,6 @@
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
@@ -59,6 +58,7 @@
 #include "freq.h"
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/glm.q b/src/language/stats/glm.q
index e7620a30b4ac2f2377d12af0772ba6b13e491a94..2e230c3620bce5bbb492946e739f85dabf2ca078 100644 (file)
--- a/src/language/stats/glm.q
+++ b/src/language/stats/glm.q
@@ -36,7 +36,6 @@
 #include <language/dictionary/split-file.h>
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <math/design-matrix.h>
@@ -45,6 +44,7 @@
 #include <math/moments.h>
 #include <output/table.h>
 
+#include "xalloc.h"
 #include "gettext.h"
 
 #define GLM_LARGE_DATA 1000

diff --git a/src/language/stats/means.q b/src/language/stats/means.q
index 0e8ba1ee0f4f5fcf1f07c4cda92b588aca432aee..071253f3efa17ab64e2f412c724011055f3186d1 100644 (file)
--- a/src/language/stats/means.q
+++ b/src/language/stats/means.q
@@ -24,10 +24,11 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q
index 2522ef5d52eb776a527022668d12d7b7d965ed87..d10dbb5b6b311f14dbdeb9fbde1b947fb141152d 100644 (file)
--- a/src/language/stats/oneway.q
+++ b/src/language/stats/oneway.q
@@ -31,7 +31,6 @@
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
@@ -45,6 +44,8 @@
 #include <output/table.h>
 #include "sort-criteria.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 7b02e4b9dcfdaed3dc669efdbc5129071cc28d97..515081a4810997fe623de70ed4b769af3442ceae 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -37,7 +37,6 @@
 #include <language/dictionary/split-file.h>
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/taint.h>
@@ -47,6 +46,8 @@
 #include <math/moments.h>
 #include <output/table.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c
index 4cf1f9fd977b0b0241eff961c6717e9f4ab7a644..2435c19a527fa29570afcfa735f1ecd0d24e1977 100644 (file)
--- a/src/language/stats/sort-cases.c
+++ b/src/language/stats/sort-cases.c
@@ -26,12 +26,13 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <data/case-ordering.h>
 #include <math/sort.h>
 #include <sys/types.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index dc227c1f7fbb3bdce9c781d2e0eb636a494b38be..fa33a4461db3d8a8a9d2b6413d4733640846e137 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -31,7 +31,6 @@
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
@@ -45,6 +44,7 @@
 #include <output/table.h>
 
 #include "size_max.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c
index dde807c37c9c4409cc54b2d6049bc859679ee137..5bd6fafacf50e6a541e4254926e12df4cb67a9d6 100644 (file)
--- a/src/language/syntax-file.c
+++ b/src/language/syntax-file.c
@@ -27,7 +27,6 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
@@ -40,6 +39,8 @@
 
 #include "prompt.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c
index f80bca2e9edfe68a9b8cd1715d4809a941e6e756..94a56f97aacb55ae642b3eac0290cd8531f2b2c3 100644 (file)
--- a/src/language/syntax-string-source.c
+++ b/src/language/syntax-string-source.c
@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include <libpspp/getl.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/str.h>
 
@@ -26,6 +25,8 @@
 
 #include "syntax-string-source.h"
 
+#include "xalloc.h"
+
 struct syntax_string_source
   {
     struct getl_interface parent;

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index fe148ab8359abf9a3221299ae9733e3c46361e2b..74136da303299e975baa9ba9176719516f92edd2 100644 (file)
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -16,13 +16,14 @@
 
 #include <config.h>
 #include <libpspp/message.h>
-#include <libpspp/alloc.h>
 #include <libpspp/str.h>
 #include <language/lexer/lexer.h>
 #include <language/command.h>
 #include <output/table.h>
 #include <output/manager.h>
 
+#include "xalloc.h"
+
 /* Echos a string to the output stream */
 int
 cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index 26c718a42de419ada022a35cb07b199dc2fd7406..d7b102836e460cf0f05650d201d718b546bb0db5 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -17,7 +17,6 @@
 #include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <language/command.h>
 #include <libpspp/message.h>
 #include <libpspp/getl.h>
@@ -25,9 +24,10 @@
 #include <language/lexer/lexer.h>
 #include <libpspp/str.h>
 #include <data/file-name.h>
-#include <dirname.h>
-#include <canonicalize.h>
 
+#include "dirname.h"
+#include "canonicalize.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index 18ead9153809a92658585ce5a48fe354415ae39e..2248b85e3630d6fc9b5eea574b1f3702b3fc4378 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -33,7 +33,6 @@
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
 #include <language/prompt.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/copyleft.h>
 #include <libpspp/float-format.h>
@@ -52,6 +51,8 @@ int tgetnum (const char *);
 #endif /* !HAVE_TERMCAP_H */
 #endif /* !HAVE_LIBTERMCAP */
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c
index 982c626e091570f76bed81abfb8feb0215c4d939..1bdb0e9a0db6487467d51aa958452cf91ef13637 100644 (file)
--- a/src/language/utilities/title.c
+++ b/src/language/utilities/title.c
@@ -24,12 +24,13 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/start-date.h>
 #include <libpspp/version.h>
 #include <output/output.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c
index bf279c90802d45c4932c3265794d8166aa2e951a..ec5a15a1f33f2a9d12f53cbd42e7d3c334ebbafe 100644 (file)
--- a/src/language/xforms/compute.c
+++ b/src/language/xforms/compute.c
@@ -16,6 +16,7 @@
 
 #include <config.h>
 
+#include <stdint.h>
 #include <stdlib.h>
 
 #include <data/case.h>
@@ -27,12 +28,12 @@
 #include <language/command.h>
 #include <language/expressions/public.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
-#include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c
index 4942f97aad1568e3e6e73eb7bed12c88867d9533..1c9b4d65735f9487b147da120585465b7501ea0d 100644 (file)
--- a/src/language/xforms/count.c
+++ b/src/language/xforms/count.c
@@ -27,13 +27,14 @@
 #include <language/lexer/lexer.h>
 #include <language/lexer/range-parser.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c
index dd3705543de2de6a1e1f10dc0e17a245a76a9b27..08bece5dd689a069b0e5f2548aedd710b1ebf313 100644 (file)
--- a/src/language/xforms/recode.c
+++ b/src/language/xforms/recode.c
@@ -30,14 +30,14 @@
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
 #include <language/lexer/range-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
-#include <libpspp/message.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 \f

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index 2aa21c22a72ce3101c6d555927f938a28afb41e8..632009eddc84cabb12dc026df09388b0a9136a12 100644 (file)
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -25,12 +25,13 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <math/random.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 3cd2f16c647d9d3f3dc6f7c5d7f12a9475f50eb4..5576c420fd903ee483ea5f5859e4ee89f31d9727 100644 (file)
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -26,10 +26,11 @@
 #include <language/expressions/public.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index bd5398ee466e42277c25e351872b079047a21e8e..bd3bc5363ba7bfcc24efc678d3681b2429815486 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-11  Ben Pfaff  <blp@gnu.org>
+
+       * xalloc.h: Removed.  Changed all users to include "xalloc.h" from
+       gnulib instead.
+
+       * xalloc.c: Removed.
+
 2007-10-11  Ben Pfaff  <blp@gnu.org>
 
        * alloc.h (local_alloc): Removed.  Changed all users to use

diff --git a/src/libpspp/alloc.c b/src/libpspp/alloc.c
deleted file mode 100644 (file)
index f4cab0d..0000000
--- a/src/libpspp/alloc.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 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
-   the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-#include "alloc.h"
-#include <stdlib.h>
-
-/* Allocates and returns N elements of S bytes each.
-   N must be nonnegative, S must be positive.
-   Returns a null pointer if the memory cannot be obtained,
-   including the case where N * S overflows the range of size_t. */
-void *
-nmalloc (size_t n, size_t s)
-{
-  return !xalloc_oversized (n, s) ? malloc (n * s) : NULL;
-}

diff --git a/src/libpspp/alloc.h b/src/libpspp/alloc.h
deleted file mode 100644 (file)
index b1a2a65..0000000
--- a/src/libpspp/alloc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 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
-   the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>. */
-
-#if !alloc_h
-#define alloc_h 1
-
-#include <stddef.h>
-
-/* malloc() wrapper functions. */
-#include "xalloc.h"
-
-void *nmalloc (size_t n, size_t s);
-
-#endif /* alloc.h */

diff --git a/src/libpspp/array.c b/src/libpspp/array.c
index e4d269373e8310dd5763fcaca4c638161e2f340a..6df2a2d803995841b319a5398661a2f4024416d5 100644 (file)
--- a/src/libpspp/array.c
+++ b/src/libpspp/array.c
@@ -88,11 +88,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include "alloc.h"
 #include <libpspp/assertion.h>
 
-#include "message.h"
-
+#include "xalloc.h"
 #include "minmax.h"
 \f
 /* Finds an element in ARRAY, which contains COUNT elements of

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 1c56ca6164fc98c1a6cd9b5f88c379c20dc520f1..4c714f20dc883041d8b2369e744ba7651242a2ad 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -6,8 +6,6 @@ noinst_LIBRARIES += src/libpspp/libpspp.a
 src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/abt.c \
        src/libpspp/abt.h \
-       src/libpspp/alloc.c \
-       src/libpspp/alloc.h \
        src/libpspp/array.c \
        src/libpspp/array.h \
        src/libpspp/assertion.h \

diff --git a/src/libpspp/getl.c b/src/libpspp/getl.c
index 4d6338ce023155b28277b2efc5d94687daea1eb6..1214b95ca1f3da178f6b34bac1af8893e0b5d3c3 100644 (file)
--- a/src/libpspp/getl.c
+++ b/src/libpspp/getl.c
@@ -22,7 +22,8 @@
 #include <libpspp/str.h>
 #include <libpspp/ll.h>
 #include <libpspp/version.h>
-#include <libpspp/alloc.h>
+
+#include "xalloc.h"
 
 struct getl_source
   {

diff --git a/src/libpspp/hash.c b/src/libpspp/hash.c
index bc5933a2b5813521dbe51e9cda5eb117590fcc72..9f1079a29a4673ccc2a3fb858360d7e7a246336f 100644 (file)
--- a/src/libpspp/hash.c
+++ b/src/libpspp/hash.c
@@ -24,12 +24,12 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "array.h"
-#include "alloc.h"
 #include "compiler.h"
 #include "misc.h"
 #include "str.h"
 #include "pool.h"
 
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index 622388a1169d9433a367984205dbeafe3574670b..695b713287b4d55096cd4ddab330d30ea7f35f03 100644 (file)
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/version.h>
 
 #include "progname.h"
+#include "xalloc.h"
 #include "xvasprintf.h"
 
 /* Current command name as set by msg_set_command_name(). */

diff --git a/src/libpspp/msg-locator.c b/src/libpspp/msg-locator.c
index 3e915382739515a6980b2d8611f7fc58cd8ae438..09550e29ac9c802def722eb8269d50efb9ab726d 100644 (file)
--- a/src/libpspp/msg-locator.c
+++ b/src/libpspp/msg-locator.c
@@ -16,12 +16,13 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include "msg-locator.h"
 #include <libpspp/message.h>
 #include <libpspp/assertion.h>
 #include "getl.h"
 
+#include "xalloc.h"
+
 /* File locator stack. */
 static const struct msg_locator **file_loc;
 

diff --git a/src/libpspp/pool.c b/src/libpspp/pool.c
index 896a27ed21703538b4bbf2a727c6de8075f20c44..ecf263abcda8ec26324b25bb46b0045cf161e336 100644 (file)
--- a/src/libpspp/pool.c
+++ b/src/libpspp/pool.c
@@ -17,12 +17,13 @@
 #include <config.h>
 #include "pool.h"
 #include <stdlib.h>
-#include "alloc.h"
 #include <libpspp/assertion.h>
 #include "message.h"
-#include "size_max.h"
 #include "str.h"
 
+#include "size_max.h"
+#include "xalloc.h"
+
 /* Fast, low-overhead memory block suballocator. */
 struct pool
   {

diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index 6539b3800ea79384373b9bc6087957190f780282..13c081dda71e0122d4fac98f2f62053fee4d44e2 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -22,12 +22,12 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/pool.h>
 
 #include "minmax.h"
 #include "size_max.h"
+#include "xalloc.h"
 #include "xsize.h"
 \f
 /* Reverses the order of NBYTES bytes at address P, thus converting

diff --git a/src/math/design-matrix.c b/src/math/design-matrix.c
index 86d19f688a8094bb3e4966c4cbce8118a20b07fa..298d03357b7208e66392c0b15bec0eb9e0f0146b 100644 (file)
--- a/src/math/design-matrix.c
+++ b/src/math/design-matrix.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <data/variable.h>
 #include <data/category.h>
@@ -36,6 +35,8 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
+#include "xalloc.h"
+
 #define DM_COLUMN_NOT_FOUND -1
 #define DM_INDEX_NOT_FOUND -3
 

diff --git a/src/math/factor-stats.c b/src/math/factor-stats.c
index 836fba985460350cbb30a8387d14cdade1b898c0..1b91e84eb717296c5bbf1e57fe1477ab52f1b207 100644 (file)
--- a/src/math/factor-stats.c
+++ b/src/math/factor-stats.c
@@ -19,7 +19,6 @@
 #include <data/value.h>
 #include <libpspp/hash.h>
 #include <libpspp/array.h>
-#include <libpspp/alloc.h>
 #include "moments.h"
 #include "percentiles.h"
 
@@ -29,6 +28,7 @@
 #include <assert.h>
 #include "histogram.h"
 
+#include "xalloc.h"
 
 void
 metrics_precalc(struct metrics *m)

diff --git a/src/math/group.c b/src/math/group.c
index 154e6f882ffd7341693a6590a3932eb990b111ce..13b545f3855399103dc3c52a196c6d2f01c3818a 100644 (file)
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -16,7 +16,6 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include "group.h"
@@ -25,6 +24,7 @@
 #include <data/variable.h>
 #include <libpspp/misc.h>
 
+#include "xalloc.h"
 
 /* Return -1 if the id of a is less than b; +1 if greater than and
    0 if equal */

diff --git a/src/math/interaction.c b/src/math/interaction.c
index 2d670b2dc726ff98656dd9fbd967a9bfd96d04d3..c8ead42912f17787dc4c01e8e46ced248e255a59 100644 (file)
--- a/src/math/interaction.c
+++ b/src/math/interaction.c
@@ -28,13 +28,14 @@
 
 #include <config.h>
 #include <assert.h>
-#include <libpspp/alloc.h>
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_vector.h>
 #include <data/category.h>
 #include <data/variable.h>
 #include "interaction.h"
 
+#include "xalloc.h"
+
 /*
   Convert a list of values to a binary vector. The order of VALS must
   correspond to the order of V.

diff --git a/src/math/levene.c b/src/math/levene.c
index 4a9f130734dcceb18988182ea02b777983b77cb4..3f8ddb29bd0b3c76d524da12c3f273643acfe0ec 100644 (file)
--- a/src/math/levene.c
+++ b/src/math/levene.c
@@ -25,13 +25,14 @@
 #include <libpspp/str.h>
 #include <data/variable.h>
 #include <data/procedure.h>
-#include <libpspp/alloc.h>
 #include <libpspp/misc.h>
 #include "group.h"
 
 #include <math.h>
 #include <stdlib.h>
 
+#include "xalloc.h"
+
 
 /* This module calculates the Levene statistic for variables.
 

diff --git a/src/math/moments.c b/src/math/moments.c
index 2934dd7ad5a547807b7395af925def288f83cb28..a5be12e9cd0d53a108cd91ea98b3d85bd6daf4f3 100644 (file)
--- a/src/math/moments.c
+++ b/src/math/moments.c
@@ -19,10 +19,11 @@
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/misc.h>
 #include <data/value.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 \f

diff --git a/src/math/sort.c b/src/math/sort.c
index 95c40fb39cdc029b2f1ce592194affed2b9002d0..5e909422b8c9dd6994d71f225bbdba4cff8789c3 100644 (file)
--- a/src/math/sort.c
+++ b/src/math/sort.c
@@ -26,11 +26,12 @@
 #include <data/casewriter.h>
 #include <data/casewriter-provider.h>
 #include <data/settings.h>
-#include <libpspp/alloc.h>
 #include <libpspp/array.h>
 #include <libpspp/assertion.h>
 #include <math/merge.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/math/ts/innovations.c b/src/math/ts/innovations.c
index f69cf89874c530564f7a2182d46915939dd6a19a..3e3be2024711a727e8a382d48841213106c8f03e 100644 (file)
--- a/src/math/ts/innovations.c
+++ b/src/math/ts/innovations.c
@@ -30,11 +30,12 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_math.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <math/coefficient.h>
 #include <math/ts/innovations.h>
 
+#include "xalloc.h"
+
 static void
 get_mean (const gsl_matrix *data,
          struct innovations_estimate **est)

diff --git a/src/output/ascii.c b/src/output/ascii.c
index f2dff490b8bb23bb92741ad68b280ed740458217..ad72e8dcff946856924705899e65ec6d7fcc1ef7 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -24,7 +24,6 @@
 
 #include <data/file-name.h>
 #include <data/settings.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/pool.h>
@@ -35,6 +34,7 @@
 #include "error.h"
 #include "minmax.h"
 #include "output.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/chart.c b/src/output/chart.c
index 489ef189f6d3817c047147ef8bcd206ec31cc56c..49819e9fe03cc4073242ae97d05b77365c7e78a2 100644 (file)
--- a/src/output/chart.c
+++ b/src/output/chart.c
@@ -29,12 +29,12 @@
 
 #include <plot.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/str.h>
 #include <output/manager.h>
 #include <output/output.h>
 
 #include "error.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/chart.h b/src/output/chart.h
index ee87956042b89c9e66f747bf7714ccb12fce415b..5444b2d14ef191ef676d4060eb909b8d9b26e362 100644 (file)
--- a/src/output/chart.h
+++ b/src/output/chart.h
@@ -25,10 +25,11 @@
 
 #include <math/chart-geometry.h>
 #include <libpspp/str.h>
-#include <libpspp/alloc.h>
 #include "manager.h"
 #include "output.h"
 
+#include "xalloc.h"
+
 #ifndef CHART_H
 #define CHART_H
 

diff --git a/src/output/charts/plot-chart.c b/src/output/charts/plot-chart.c
index 9978c8c97747a51af578b6173446b11045876075..88aa58b06803a4c65a7f1f52a021acf116f111c9 100644 (file)
--- a/src/output/charts/plot-chart.c
+++ b/src/output/charts/plot-chart.c
@@ -32,11 +32,11 @@
 
 
 #include <libpspp/str.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <output/manager.h>
 #include <output/output.h>
 
+#include "xalloc.h"
 
 const char *const data_colour[] = {
   "brown",

diff --git a/src/output/charts/plot-chart.h b/src/output/charts/plot-chart.h
index 958a0dfde925cb3700d9d0a0022d467cd96dcf03..5cee5a9a245f82a87f66769729c37385fd4d5169 100644 (file)
--- a/src/output/charts/plot-chart.h
+++ b/src/output/charts/plot-chart.h
@@ -28,10 +28,10 @@
 #include <output/chart.h>
 
 #include <libpspp/str.h>
-#include <libpspp/alloc.h>
 #include <output/manager.h>
 #include <output/output.h>
 
+#include "xalloc.h"
 
 #ifndef PLOT_CHART_H
 #define PLOT_CHART_H

diff --git a/src/output/html.c b/src/output/html.c
index 17be1751c1b1cf2fc71bcd58788163a2201c8e1d..893c18527b7ff30e431762ede6658332e6fc5e46 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -24,7 +24,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <data/file-name.h>
@@ -34,6 +33,8 @@
 #include "table.h"
 #include <libpspp/version.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/output/output.c b/src/output/output.c
index 842e1c15c63bc383219c4a5de027883b2c086aff..8eccf763f9b9ea3b49f7192c9e4f547ac1161cce 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -25,7 +25,6 @@
 
 #include <data/file-name.h>
 #include <data/settings.h>
-#include <libpspp/alloc.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 #include <output/htmlP.h>
@@ -33,6 +32,7 @@
 
 #include "error.h"
 #include "intprops.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/postscript.c b/src/output/postscript.c
index 9a33807096bcd092c03380683384443f005ad133..d4f5b9f3fb4ac94b1a183b78d450d586950864e9 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -23,7 +23,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
@@ -38,11 +37,13 @@
 #include "afm.h"
 #include "chart.h"
 #include "error.h"
-#include "intprops.h"
 #include "manager.h"
-#include "minmax.h"
 #include "output.h"
+
+#include "intprops.h"
+#include "minmax.h"
 #include "size_max.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/table.c b/src/output/table.c
index c0af3d0f7dcabb248ba84e435793753219c8d87b..92f79541d6fbddad4e02b3a6a69961c5bf7da43a 100644 (file)
--- a/src/output/table.c
+++ b/src/output/table.c
@@ -29,13 +29,13 @@
 #include <data/data-out.h>
 #include <data/format.h>
 #include <data/value.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/misc.h>
 #include <libpspp/pool.h>
 
 #include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/clipboard.c b/src/ui/gui/clipboard.c
index 1661d4132a24e2cab083d3a29c8c482ad45f4479..4d7ca63ed9729a6b3eab153c69b83de16bce1e72 100644 (file)
--- a/src/ui/gui/clipboard.c
+++ b/src/ui/gui/clipboard.c
@@ -22,7 +22,6 @@
 #include "psppire-data-store.h"
 #include <data/casereader.h>
 #include <data/case-map.h>
-#include <libpspp/alloc.h>
 #include <data/casewriter.h>
 #include <data/format.h>
 #include <data/data-out.h>
@@ -30,6 +29,7 @@
 #include <stdlib.h>
 #include "data-editor.h"
 
+#include "xalloc.h"
 
 /* A casereader and dictionary holding the data currently in the clip */
 static struct casereader *clip_datasheet = NULL;

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 4978edaffc24947d114f6f160146507a935a2319..0fc436208f28d680bd6ce55410a1f4f9bb33e091 100644 (file)
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -30,18 +30,17 @@ which match particular strings */
 #include <data/datasheet.h>
 #include <data/data-in.h>
 #include "psppire-data-store.h"
-#include <libpspp/alloc.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <libpspp/message.h>
 
-
-
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <stdlib.h>
 
+#include "xalloc.h"
+
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid

diff --git a/src/ui/gui/syntax-editor-source.c b/src/ui/gui/syntax-editor-source.c
index 289bd37a0f5cd7537a0806f1a10ccfb40e935fb8..f7617a893155faf03b786680c6e0c14114603b04 100644 (file)
--- a/src/ui/gui/syntax-editor-source.c
+++ b/src/ui/gui/syntax-editor-source.c
@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include <libpspp/getl.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/str.h>
 
@@ -29,6 +28,8 @@
 #include "syntax-editor-source.h"
 #include "syntax-editor.h"
 
+#include "xalloc.h"
+
 struct syntax_editor_source
   {
     struct getl_interface parent;

diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index 976af0c2191a7377e6e00d90209c8d9815d86bda..71d42a0483d5c159ea68a6521d6f888d1a08b112 100644 (file)
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/copyleft.h>
 #include <libpspp/message.h>
@@ -38,6 +37,8 @@
 #include <libpspp/verbose-msg.h>
 #include "read-line.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid