Get rid of src/libpspp/debug-print.h and all its users. (There were

[pspp-builds.git] / src / data / por-file-reader.c

diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index 1ee598873ed89edff4d6b099a7ff6b2b21c74036..3f385223e5afe74f277b6bb4e105a659902a4aec 100644 (file)
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include "por-file-reader.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,26 +29,24 @@
 #include <errno.h>
 #include <math.h>
 #include <setjmp.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include <stdbool.h>
 #include "case.h"
-#include "compiler.h"
+#include <libpspp/compiler.h>
 #include "dictionary.h"
 #include "file-handle-def.h"
 #include "format.h"
-#include "hash.h"
-#include "magic.h"
-#include "misc.h"
-#include "pool.h"
-#include "str.h"
+#include <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
 #include "value-labels.h"
 #include "variable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
-
 /* portable_to_local[PORTABLE] translates the given portable
    character into the local character set. */
 static const char portable_to_local[256] =
@@ -79,7 +77,8 @@ struct pfm_reader
 
 static void
 error (struct pfm_reader *r, const char *msg,...)
-     PRINTF_FORMAT (2, 3);
+     PRINTF_FORMAT (2, 3)
+     NO_RETURN;
 
 /* Displays MSG as an error message and aborts reading the
    portable file via longjmp(). */