X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fascii.c;h=f6bc7a6f91b3bb6fbe96f920f46639ac5819071f;hb=6e3e7572c1b10aa6723a22308979ba26f4e1cb48;hp=ffe0c0452a9c77e372bace6f825483dd3aff4a20;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/output/ascii.c b/src/output/ascii.c
index ffe0c0452a..f6bc7a6f91 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -18,20 +18,21 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "message.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
 #include "chart.h"
-#include "filename.h"
-#include "misc.h"
+#include <libpspp/compiler.h>
+#include <data/filename.h>
+#include <libpspp/misc.h>
 #include "output.h"
-#include "pool.h"
-#include "start-date.h"
-#include "version.h"
+#include <libpspp/pool.h>
+#include <libpspp/start-date.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -183,7 +184,7 @@ struct ascii_driver_ext
     int lines_cap;              /* Number of lines allocated. */
     int w, l;			/* Actual width & length w/o margins, etc. */
     int cur_font;		/* Current font by OUTP_F_*. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
     int debug;			/* Set by som_text_draw(). */
 #endif
   };
@@ -265,7 +266,7 @@ ascii_preopen_driver (struct outp_driver *this)
   x->lines = NULL;
   x->lines_cap = 0;
   x->cur_font = OUTP_F_R;
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   x->debug = 0;
 #endif
   return 1;
@@ -779,7 +780,7 @@ ascii_line_horz (struct outp_driver *this, const struct rect *r,
   assert (this->driver_open && this->page_open);
   if (x1 == x2)
     return;
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (x1 > x2
       || x1 < 0 || x1 >= ext->w
       || x2 <= 0 || x2 > ext->w
@@ -813,7 +814,7 @@ ascii_line_vert (struct outp_driver *this, const struct rect *r,
   assert (this->driver_open && this->page_open);
   if (y1 == y2)
     return;
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (y1 > y2
       || x1 < 0 || x1 >= ext->w
       || y1 < 0 || y1 >= ext->l
@@ -846,7 +847,7 @@ ascii_line_intersection (struct outp_driver *this, const struct rect *r,
   int l;
 
   assert (this->driver_open && this->page_open);
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (x < 0 || x >= ext->w || y < 0 || y >= ext->l)
     {
 #if !SUPPRESS_WARNINGS
@@ -994,7 +995,7 @@ delineate (struct outp_driver *this, struct outp_text *t, int draw)
   /* Temporary struct outp_text to pass to low-level function. */
   struct outp_text temp;
 
-#if GLOBAL_DEBUGGING && 0
+#if DEBUGGING && 0
   if (!ext->debug)
     {
       ext->debug = 1;