X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=4a915fe2ef6e3acd2635ada098ccf0b6a0b3f982;hb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;hp=b1b404637bd76daf7d762bd7dd786be4f1af2218;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/output/output.c b/src/output/output.c
index b1b40463..4a915fe2 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -19,18 +19,19 @@
 
 #include <config.h>
 #include "output.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
-#include "alloc.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
 #include "htmlP.h"
-#include "misc.h"
-#include "settings.h"
-#include "str.h"
+#include "intprops.h"
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -194,7 +195,7 @@ expand_name (char *bp, char *ep)
 static const char *
 find_defn_value (const char *key)
 {
-  static char buf[INT_DIGITS + 1];
+  static char buf[INT_STRLEN_BOUND (int) + 1];
   struct outp_defn *d;
 
   for (d = outp_macros; d; d = d->next)
@@ -219,23 +220,15 @@ void
 outp_init (void)
 {
   extern struct outp_class ascii_class;
-#if !NO_POSTSCRIPT
   extern struct outp_class postscript_class;
   extern struct outp_class epsf_class;
-#endif
-#if !NO_HTML
   extern struct outp_class html_class;
-#endif
 
   char def[] = "default";
 
-#if !NO_HTML
   add_class (&html_class);
-#endif
-#if !NO_POSTSCRIPT
   add_class (&epsf_class);
   add_class (&postscript_class);
-#endif
   add_class (&ascii_class);
 
   add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
@@ -1257,7 +1250,7 @@ exit:
 struct outp_driver *
 outp_drivers (struct outp_driver *d)
 {
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   struct outp_driver *orig_d = d;
 #endif