[Pspp-cvs] pspp ./ChangeLog ./configure.ac src/data/Change...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/03/04 21:26:39

Modified files:
        .              : ChangeLog configure.ac 
        src/data       : ChangeLog case.c case.h make-file.c 
                         sfm-private.h value.h variable.h 
        src/libpspp    : hash.c hash.h pool.h 
        src/output     : ascii.c manager.c output.c table.c table.h 
        src/output/charts: ChangeLog automake.mk 
Removed files:
        .              : pref.h.orig 

Log message:
        Got rid of pref.h.orig (and pref.h) entirely, moving its contents into
        other files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/ChangeLog.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/configure.ac.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/case.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/case.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/make-file.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sfm-private.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/value.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/variable.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/hash.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/hash.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/pool.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/ascii.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/manager.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/output.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/table.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/table.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: pspp/ChangeLog
diff -u pspp/ChangeLog:1.45 pspp/ChangeLog:1.46
--- pspp/ChangeLog:1.45 Sat Mar  4 21:00:38 2006
+++ pspp/ChangeLog      Sat Mar  4 21:26:39 2006
@@ -1,3 +1,13 @@
+Sat Mar  4 13:20:56 2006  Ben Pfaff  <address@hidden>
+
+       * configure.ac: Get rid of pref.h.orig.
+
+       * pref.h.orig: Removed.  Moved SHORT_NAME_LEN, LONG_NAME_LEN to
+       src/data/variable.h.  Removed GLOBAL_DEBUGGING entirely, changing
+       all references to DEBUGGING.  Moved P_tmpdir to
+       src/data/make-file.c.  Moved NO_CHARTS to
+       src/output/charts/automake.mk.
+
 Sat Mar  4 12:58:34 2006  Ben Pfaff  <address@hidden>
 
        * pref.h.orig: Move GCC attribute declarations to
Index: pspp/configure.ac
diff -u pspp/configure.ac:1.39 pspp/configure.ac:1.40
--- pspp/configure.ac:1.39      Sat Mar  4 20:38:51 2006
+++ pspp/configure.ac   Sat Mar  4 21:26:39 2006
@@ -109,9 +109,6 @@
 AC_PROG_LN_S
 
 
-AH_BOTTOM([#include <pref.h>])
-
-
 AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" )
 AM_CONDITIONAL(msdos, test x"$host_os" = x"msdos" )
 
@@ -125,19 +122,6 @@
 
 AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
 
-AC_CONFIG_COMMANDS([pref.h],[
-          # Copy pref.h from pref.h.orig if prudent
-          if test ! -f pref.h; then
-            echo "creating pref.h"
-            cp $ac_top_srcdir/pref.h.orig pref.h
-          elif test "`ls -t pref.h.orig pref.h 2>/dev/null | sed 1q`" = 
pref.h.orig; then
-            echo "replacing pref.h with newer pref.h.orig"
-            cp $ac_top_srcdir/pref.h.orig pref.h
-          else
-            echo "pref.h exists"
-          fi
-          if test -f pref.h; then touch pref.h; fi
-         ])
 AC_OUTPUT
 
 dnl configure.ac ends here
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.2 pspp/src/data/ChangeLog:1.3
--- pspp/src/data/ChangeLog:1.2 Sat Mar  4 05:01:06 2006
+++ pspp/src/data/ChangeLog     Sat Mar  4 21:26:39 2006
@@ -1,3 +1,13 @@
+Sat Mar  4 13:22:51 2006  Ben Pfaff  <address@hidden>
+
+       * sfm-private.h: Include variable.h, to get SHORT_NAME_LEN.
+
+       * value.h: Remove check on MAX_SHORT_STRING, which I don't think
+       really applies.
+
+       * variable.h: Move definition of SHORT_NAME_LEN, LONG_NAME_LEN
+       here from pref.h.orig.
+
 Sat Mar  4 12:50:48 WST 2006 John Darrington <address@hidden>
 
        * sys-file-reader.c: Fixed bug reading compressed files.
Index: pspp/src/data/case.c
diff -u pspp/src/data/case.c:1.1 pspp/src/data/case.c:1.2
--- pspp/src/data/case.c:1.1    Sat Mar  4 01:11:57 2006
+++ pspp/src/data/case.c        Sat Mar  4 21:26:39 2006
@@ -26,7 +26,7 @@
 #include "str.h"
 #include "variable.h"
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 #undef NDEBUG
 #else
 #ifndef NDEBUG
@@ -66,7 +66,7 @@
           + value_cnt * sizeof (union value));
 }
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Initializes C as a null case. */
 void
 case_nullify (struct ccase *c) 
@@ -74,16 +74,16 @@
   c->case_data = NULL;
   c->this = c;
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Returns true iff C is a null case. */
 int
 case_is_null (const struct ccase *c) 
 {
   return c->case_data == NULL;
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
 /* Initializes C as a new case that can store VALUE_CNT values.
    The values have indeterminate contents until explicitly
@@ -95,7 +95,7 @@
     xalloc_die ();
 }
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Initializes CLONE as a copy of ORIG. */
 void
 case_clone (struct ccase *clone, const struct ccase *orig)
@@ -113,9 +113,9 @@
     }
   orig->case_data->ref_cnt++;
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Replaces DST by SRC and nullifies SRC.
    DST and SRC must be initialized cases at entry. */
 void
@@ -131,9 +131,9 @@
   dst->this = dst;
   case_nullify (src);
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Destroys case C. */
 void
 case_destroy (struct ccase *c) 
@@ -151,7 +151,7 @@
       free (cd); 
     }
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
 /* Resizes case C from OLD_CNT to NEW_CNT values. */
 void
@@ -183,7 +183,7 @@
   c->case_data = malloc (case_size (value_cnt));
   if (c->case_data != NULL) 
     {
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
       c->this = c;
 #endif
       c->case_data->value_cnt = value_cnt;
@@ -192,7 +192,7 @@
     }
   else 
     {
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
       c->this = c;
 #endif
       return 0;
@@ -209,7 +209,7 @@
   return 1;
 }
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Copies VALUE_CNT values from SRC (starting at SRC_IDX) to DST
    (starting at DST_IDX). */
 void
@@ -236,9 +236,9 @@
              src->case_data->values + src_idx,
              sizeof *dst->case_data->values * value_cnt); 
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Copies case C to OUTPUT.
    OUTPUT_SIZE is the number of `union values' in OUTPUT,
    which must match the number of `union values' in C. */
@@ -256,9 +256,9 @@
   memcpy (output, c->case_data->values,
           c->case_data->value_cnt * sizeof *output);
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Copies INPUT into case C.
    INPUT_SIZE is the number of `union values' in INPUT,
    which must match the number of `union values' in C. */
@@ -278,9 +278,9 @@
   memcpy (c->case_data->values, input,
           c->case_data->value_cnt * sizeof *input);
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Returns a pointer to the `union value' used for the
    element of C numbered IDX.
    The caller must not modify the returned data. */
@@ -295,9 +295,9 @@
 
   return &c->case_data->values[idx];
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Returns the numeric value of the `union value' in C numbered
    IDX. */
 double
@@ -311,9 +311,9 @@
 
   return c->case_data->values[idx].f;
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Returns the string value of the `union value' in C numbered
    IDX.
    (Note that the value is not null-terminated.)
@@ -329,9 +329,9 @@
 
   return c->case_data->values[idx].s;
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 /* Returns a pointer to the `union value' used for the
    element of C numbered IDX.
    The caller is allowed to modify the returned data. */
@@ -348,7 +348,7 @@
     case_unshare (c);
   return &c->case_data->values[idx];
 }
-#endif /* GLOBAL_DEBUGGING */
+#endif /* DEBUGGING */
 
 /* Compares the values of the VAR_CNT variables in VP
    in cases A and B and returns a strcmp()-type result. */
Index: pspp/src/data/case.h
diff -u pspp/src/data/case.h:1.1 pspp/src/data/case.h:1.2
--- pspp/src/data/case.h:1.1    Sat Mar  4 01:11:57 2006
+++ pspp/src/data/case.h        Sat Mar  4 21:26:39 2006
@@ -30,7 +30,7 @@
 struct ccase 
   {
     struct case_data *case_data;        /* Actual data. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
     struct ccase *this;                 /* Detects unauthorized move/copy. */
 #endif
   };
@@ -43,7 +43,7 @@
     union value values[1];              /* Values. */
   };
 
-#ifdef GLOBAL_DEBUGGING
+#ifdef DEBUGGING
 #define CASE_INLINE
 #else
 #define CASE_INLINE static
@@ -89,7 +89,7 @@
 
 void case_unshare (struct ccase *);
 
-#ifndef GLOBAL_DEBUGGING
+#ifndef DEBUGGING
 #include <stdlib.h>
 #include "str.h"
 
@@ -183,6 +183,6 @@
     case_unshare (c);
   return &c->case_data->values[idx];
 }
-#endif /* !GLOBAL_DEBUGGING */
+#endif /* !DEBUGGING */
 
 #endif /* case.h */
Index: pspp/src/data/make-file.c
diff -u pspp/src/data/make-file.c:1.1 pspp/src/data/make-file.c:1.2
--- pspp/src/data/make-file.c:1.1       Sat Mar  4 01:11:57 2006
+++ pspp/src/data/make-file.c   Sat Mar  4 21:26:39 2006
@@ -31,6 +31,11 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+/* Non ansi compilers may set this */
+#ifndef P_tmpdir
+#define P_tmpdir "/tmp"
+#endif
+
 /* Creates a temporary file and stores its name in *FILENAME and
    a file descriptor for it in *FD.  Returns success.  Caller is
    responsible for freeing *FILENAME. */
Index: pspp/src/data/sfm-private.h
diff -u pspp/src/data/sfm-private.h:1.2 pspp/src/data/sfm-private.h:1.3
--- pspp/src/data/sfm-private.h:1.2     Sat Mar  4 21:00:38 2006
+++ pspp/src/data/sfm-private.h Sat Mar  4 21:26:39 2006
@@ -21,6 +21,7 @@
    structures. */
 
 #include "compiler.h"
+#include "variable.h"
 
 /* This attribute might avoid some problems.  On the other hand... */
 #define P ATTRIBUTE ((packed))
Index: pspp/src/data/value.h
diff -u pspp/src/data/value.h:1.1 pspp/src/data/value.h:1.2
--- pspp/src/data/value.h:1.1   Sat Mar  4 01:11:57 2006
+++ pspp/src/data/value.h       Sat Mar  4 21:26:39 2006
@@ -33,14 +33,6 @@
 /* Max string length. */
 #define MAX_STRING 255
 
-/* FYI: It is a bad situation if sizeof(flt64) < MAX_SHORT_STRING:
-   then short string missing values can be truncated in system files
-   because there's only room for as many characters as can fit in a
-   flt64. */
-#if MAX_SHORT_STRING > SHORT_NAME_LEN
-#error MAX_SHORT_STRING must be less than or equal to SHORT_NAME_LEN.
-#endif
-
 /* Special values. */
 #define SYSMIS (-DBL_MAX)
 #define LOWEST second_lowest_value
Index: pspp/src/data/variable.h
diff -u pspp/src/data/variable.h:1.1 pspp/src/data/variable.h:1.2
--- pspp/src/data/variable.h:1.1        Sat Mar  4 01:11:57 2006
+++ pspp/src/data/variable.h    Sat Mar  4 21:26:39 2006
@@ -40,6 +40,10 @@
 const char *var_type_adj (enum var_type);
 const char *var_type_noun (enum var_type);
 
+/* Maximum variable name lengths. */
+#define SHORT_NAME_LEN 8        /* Short name length. */
+#define LONG_NAME_LEN 64        /* Long name length. */
+
 /* A variable's dictionary entry.  */
 struct variable
   {
Index: pspp/src/libpspp/hash.c
diff -u pspp/src/libpspp/hash.c:1.2 pspp/src/libpspp/hash.c:1.3
--- pspp/src/libpspp/hash.c:1.2 Sat Mar  4 21:00:38 2006
+++ pspp/src/libpspp/hash.c     Sat Mar  4 21:26:39 2006
@@ -567,7 +567,7 @@
 
 /* Debug helpers. */
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
 #undef NDEBUG
 #include "message.h"
 #include <stdio.h>
Index: pspp/src/libpspp/hash.h
diff -u pspp/src/libpspp/hash.h:1.1 pspp/src/libpspp/hash.h:1.2
--- pspp/src/libpspp/hash.h:1.1 Sat Mar  4 01:11:57 2006
+++ pspp/src/libpspp/hash.h     Sat Mar  4 21:26:39 2006
@@ -62,7 +62,7 @@
 void *hsh_next (struct hsh_table *, struct hsh_iterator *);
 
 /* Search and insertion with assertion. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
 void hsh_force_insert (struct hsh_table *, void *);
 void *hsh_force_find (struct hsh_table *, const void *);
 void hsh_force_delete (struct hsh_table *, const void *);
@@ -76,7 +76,7 @@
 size_t hsh_count (struct hsh_table *);
 
 /* Debugging. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
 void hsh_dump (struct hsh_table *);
 #endif
 
Index: pspp/src/libpspp/pool.h
diff -u pspp/src/libpspp/pool.h:1.2 pspp/src/libpspp/pool.h:1.3
--- pspp/src/libpspp/pool.h:1.2 Sat Mar  4 21:00:38 2006
+++ pspp/src/libpspp/pool.h     Sat Mar  4 21:26:39 2006
@@ -92,7 +92,7 @@
 void pool_mark (struct pool *, struct pool_mark *);
 void pool_release (struct pool *, const struct pool_mark *);
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
 void pool_dump (const struct pool *, const char *title);
 #endif
 
Index: pspp/src/output/ascii.c
diff -u pspp/src/output/ascii.c:1.2 pspp/src/output/ascii.c:1.3
--- pspp/src/output/ascii.c:1.2 Sat Mar  4 21:00:38 2006
+++ pspp/src/output/ascii.c     Sat Mar  4 21:26:39 2006
@@ -184,7 +184,7 @@
     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
   };
@@ -266,7 +266,7 @@
   x->lines = NULL;
   x->lines_cap = 0;
   x->cur_font = OUTP_F_R;
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   x->debug = 0;
 #endif
   return 1;
@@ -780,7 +780,7 @@
   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
@@ -814,7 +814,7 @@
   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
@@ -847,7 +847,7 @@
   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
@@ -995,7 +995,7 @@
   /* 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;
Index: pspp/src/output/charts/ChangeLog
diff -u pspp/src/output/charts/ChangeLog:1.1 
pspp/src/output/charts/ChangeLog:1.2
--- pspp/src/output/charts/ChangeLog:1.1        Sat Mar  4 02:00:57 2006
+++ pspp/src/output/charts/ChangeLog    Sat Mar  4 21:26:39 2006
@@ -1,3 +1,7 @@
+Sat Mar  4 13:24:39 2006  Ben Pfaff  <address@hidden>
+
+       * automake.mk: Move definition of NO_CHARTS here from pref.h.orig.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <address@hidden>
        
        * Moved files from src directory
Index: pspp/src/output/charts/automake.mk
diff -u pspp/src/output/charts/automake.mk:1.1 
pspp/src/output/charts/automake.mk:1.2
--- pspp/src/output/charts/automake.mk:1.1      Sat Mar  4 02:00:57 2006
+++ pspp/src/output/charts/automake.mk  Sat Mar  4 21:26:39 2006
@@ -36,4 +36,6 @@
 
 EXTRA_DIST += $(chart_sources)
 
+AM_CPPFLAGS += -DNO_CHARTS
+
 endif
Index: pspp/src/output/manager.c
diff -u pspp/src/output/manager.c:1.1 pspp/src/output/manager.c:1.2
--- pspp/src/output/manager.c:1.1       Sat Mar  4 01:11:58 2006
+++ pspp/src/output/manager.c   Sat Mar  4 21:26:39 2006
@@ -93,7 +93,7 @@
 void
 som_submit (struct som_entity *t)
 {
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   static int entry;
   
   assert (entry++ == 0);
@@ -107,7 +107,7 @@
       t->class->headers (&hl, &hr, &ht, &hb);
 
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
       if (hl + hr > nc || ht + hb > nr)
        {
          printf ("headers: (l,r)=(%d,%d), (t,b)=(%d,%d) in table size 
(%d,%d)\n",
@@ -135,7 +135,7 @@
 
   }
   
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   assert (--entry == 0);
 #endif
 }
Index: pspp/src/output/output.c
diff -u pspp/src/output/output.c:1.2 pspp/src/output/output.c:1.3
--- pspp/src/output/output.c:1.2        Sat Mar  4 20:38:51 2006
+++ pspp/src/output/output.c    Sat Mar  4 21:26:39 2006
@@ -1258,7 +1258,7 @@
 struct outp_driver *
 outp_drivers (struct outp_driver *d)
 {
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   struct outp_driver *orig_d = d;
 #endif
 
Index: pspp/src/output/table.c
diff -u pspp/src/output/table.c:1.2 pspp/src/output/table.c:1.3
--- pspp/src/output/table.c:1.2 Sat Mar  4 21:00:38 2006
+++ pspp/src/output/table.c     Sat Mar  4 21:26:39 2006
@@ -69,7 +69,7 @@
 
   nalloc_func = reallocable ? pool_nmalloc : pool_nalloc;
   alloc_func = reallocable ? pool_malloc : pool_alloc;
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   t->reallocable = reallocable;
 #endif
 
@@ -142,7 +142,7 @@
   int ro, co;
   
   assert (t != NULL);
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   assert (t->reallocable);
 #endif
   ro = t->row_ofs;
@@ -251,7 +251,7 @@
 
   assert (t != NULL);
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (x + t->col_ofs < 0 || x + t->col_ofs > t->nc
       || y1 + t->row_ofs < 0 || y1 + t->row_ofs >= t->nr
       || y2 + t->row_ofs < 0 || y2 + t->row_ofs >= t->nr)
@@ -325,7 +325,7 @@
 {
   assert (t != NULL);
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (x1 + t->col_ofs < 0 || x1 + t->col_ofs >= t->nc 
       || x2 + t->col_ofs < 0 || x2 + t->col_ofs >= t->nc
       || y1 + t->row_ofs < 0 || y1 + t->row_ofs >= t->nr 
@@ -493,7 +493,7 @@
   if (width == 0)
     {
       width = d->prop_em_width * 8;
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
       printf ("warning: table column %d contains no data.\n", c);
 #endif
     }
@@ -572,7 +572,7 @@
   char *contents;
 
   assert (table != NULL && v != NULL && f != NULL);
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (c + table->col_ofs < 0 || r + table->row_ofs < 0
       || c + table->col_ofs >= table->nc
       || r + table->row_ofs >= table->nr)
@@ -614,7 +614,7 @@
 
   f = make_output_format (FMT_F, w, d);
   
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (c + table->col_ofs < 0 || r + table->row_ofs < 0
       || c + table->col_ofs >= table->nc
       || r + table->row_ofs >= table->nr)
@@ -657,7 +657,7 @@
   assert (r < table->nr);
   
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (c + table->col_ofs < 0 || r + table->row_ofs < 0
       || c + table->col_ofs >= table->nc
       || r + table->row_ofs >= table->nr)
@@ -694,7 +694,7 @@
   assert (y2 + table->row_ofs < table->nr);
   assert (x2 + table->col_ofs < table->nc);
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (x1 + table->col_ofs < 0 || x1 + table->col_ofs >= table->nc
       || y1 + table->row_ofs < 0 || y1 + table->row_ofs >= table->nr
       || x2 < x1 || x2 + table->col_ofs >= table->nc
@@ -758,7 +758,7 @@
 {
   assert (table != NULL && string != NULL);
   
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (c + table->col_ofs < 0 || r + table->row_ofs < 0
       || c + table->col_ofs >= table->nc
       || r + table->row_ofs >= table->nr)
@@ -891,7 +891,7 @@
   int diff = 0;
 
   assert (t != NULL);
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   if (row < -1 || row >= t->nr)
     {
       printf ("tab_offset(): row=%d in %d-row table\n", row, t->nr);
@@ -959,7 +959,7 @@
   for (t->vr_tot = i = 0; i <= t->nc; i++)
     t->vr_tot += t->wrv[i] = d->vert_line_spacing[t->trv[i]];
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   for (i = 0; i < t->nr; i++)
     t->h[i] = -1;
   for (i = 0; i < t->nc; i++)
@@ -969,7 +969,7 @@
   assert (t->dim != NULL);
   t->dim (t, d);
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   {
     int error = 0;
 
Index: pspp/src/output/table.h
diff -u pspp/src/output/table.h:1.1 pspp/src/output/table.h:1.2
--- pspp/src/output/table.h:1.1 Sat Mar  4 01:11:58 2006
+++ pspp/src/output/table.h     Sat Mar  4 21:26:39 2006
@@ -102,7 +102,7 @@
 
     /* Editing info. */
     int col_ofs, row_ofs;      /* X and Y offsets. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
     int reallocable;           /* Can table be reallocated? */
 #endif
   };