Changed include paths to be explicitly specified in the #include directive.

[pspp-builds.git] / src / output / postscript.c

diff --git a/src/output/postscript.c b/src/output/postscript.c
index fbe8f6426c9815f7b9a7d931165b9bec750bac63..e6ce8614825b6554adae61b6ea5478ce642e08b3 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -19,12 +19,9 @@
 
 #include <config.h>
 
-/*this #if encloses the remainder of the file. */
-#if !NO_POSTSCRIPT
-
 #include <ctype.h>
 #include "chart.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -34,18 +31,20 @@
 #include <unistd.h>
 #endif
 
-#include "alloc.h"
-#include "bit-vector.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/bit-vector.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
 #include "font.h"
 #include "getline.h"
-#include "hash.h"
-#include "misc.h"
+#include <libpspp/hash.h>
+#include "intprops.h"
+#include <libpspp/misc.h>
 #include "output.h"
 #include "manager.h"
-#include "start-date.h"
-#include "version.h"
+#include <libpspp/start-date.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -1190,20 +1189,20 @@ postopen (struct file_ext *f)
     {"title", 0},
     {0, 0},
   };
-  char boundbox[INT_DIGITS * 4 + 4];
+  char boundbox[INT_STRLEN_BOUND (int) * 4 + 4];
 #if HAVE_UNISTD_H
   char host[128];
 #endif
-  char scaling[INT_DIGITS + 5];
+  char scaling[INT_STRLEN_BOUND (int) + 5];
   time_t curtime;
   struct tm *loctime;
   char *p, *cp;
-  char paper_width[INT_DIGITS + 1];
-  char paper_length[INT_DIGITS + 1];
-  char left_margin[INT_DIGITS + 1];
-  char top_margin[INT_DIGITS + 1];
-  char line_width[INT_DIGITS + 1];
-  char line_width_thick[INT_DIGITS + 1];
+  char paper_width[INT_STRLEN_BOUND (int) + 1];
+  char paper_length[INT_STRLEN_BOUND (int) + 1];
+  char left_margin[INT_STRLEN_BOUND (int) + 1];
+  char top_margin[INT_STRLEN_BOUND (int) + 1];
+  char line_width[INT_STRLEN_BOUND (int) + 1];
+  char line_width_thick[INT_STRLEN_BOUND (int) + 1];
 
   struct outp_driver *this = f->param;
   struct ps_driver_ext *x = this->ext;
@@ -1394,8 +1393,8 @@ postopen (struct file_ext *f)
   
   if (!outp_title)
     {
-      dict[16].value = cp = local_alloc (strlen (dict[17].value) + 30);
-      sprintf (cp, "PSPP (%s)", dict[17].value);
+      dict[16].value = cp = local_alloc (16);
+      strcpy (cp, "PSPP");
     }
   else
     {
@@ -2402,7 +2401,7 @@ write_text (struct outp_driver *this,
 
   int last_y;
 
-  char number[INT_DIGITS + 1];
+  char number[INT_STRLEN_BOUND (int) + 1];
   char line[80];
   char *lp;
 
@@ -3043,5 +3042,3 @@ struct outp_class epsf_class =
   ps_chart_finalise
 
 };
-
-#endif /* NO_POSTSCRIPT */