From 5fd22ca7771c8175ef05e91e1194c3c4096337f4 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 4 Mar 2006 21:26:39 +0000 Subject: [PATCH] Got rid of pref.h.orig (and pref.h) entirely, moving its contents into other files. --- ChangeLog | 10 +++++++ configure.ac | 16 ----------- pref.h.orig | 35 ----------------------- src/data/ChangeLog | 10 +++++++ src/data/case.c | 54 +++++++++++++++++------------------ src/data/case.h | 8 +++--- src/data/make-file.c | 5 ++++ src/data/sfm-private.h | 1 + src/data/value.h | 8 ------ src/data/variable.h | 4 +++ src/libpspp/hash.c | 2 +- src/libpspp/hash.h | 4 +-- src/libpspp/pool.h | 2 +- src/output/ascii.c | 12 ++++---- src/output/charts/ChangeLog | 4 +++ src/output/charts/automake.mk | 2 ++ src/output/manager.c | 6 ++-- src/output/output.c | 2 +- src/output/table.c | 26 ++++++++--------- src/output/table.h | 2 +- 20 files changed, 95 insertions(+), 118 deletions(-) delete mode 100644 pref.h.orig diff --git a/ChangeLog b/ChangeLog index 253804ca..bbf4498c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sat Mar 4 13:20:56 2006 Ben Pfaff + + * 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 * pref.h.orig: Move GCC attribute declarations to diff --git a/configure.ac b/configure.ac index 658d1217..ff5d3f00 100644 --- a/configure.ac +++ b/configure.ac @@ -109,9 +109,6 @@ AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept AC_PROG_LN_S -AH_BOTTOM([#include ]) - - AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" ) AM_CONDITIONAL(msdos, test x"$host_os" = x"msdos" ) @@ -125,19 +122,6 @@ fi 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 diff --git a/pref.h.orig b/pref.h.orig deleted file mode 100644 index f2efb834..00000000 --- a/pref.h.orig +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- C -*- */ - -/* - * - * Debugging - * - */ - -/* Define to get lots of info printed by procedures. */ -/*#define DEBUGGING 1*/ - -#if DEBUGGING -#define GLOBAL_DEBUGGING 1 -#endif - -#if !HAVE_LIBPLOT -#define NO_CHARTS 1 -#endif - -/* Filesystems. */ - -/* Options. */ - -/* Approximate amount of memory, in bytes, to allocate before paging - to disk. */ -#define MAX_WORKSPACE (4*1024*1024) /* 4 MBytes */ - - -/* Non ansi compilers may set this */ -#ifndef P_tmpdir -#define P_tmpdir "/tmp" -#endif - -#define SHORT_NAME_LEN 8 -#define LONG_NAME_LEN 64 diff --git a/src/data/ChangeLog b/src/data/ChangeLog index e873a394..58941a86 100644 --- a/src/data/ChangeLog +++ b/src/data/ChangeLog @@ -1,3 +1,13 @@ +Sat Mar 4 13:22:51 2006 Ben Pfaff + + * 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 * sys-file-reader.c: Fixed bug reading compressed files. diff --git a/src/data/case.c b/src/data/case.c index 6fad874d..8613eca6 100644 --- a/src/data/case.c +++ b/src/data/case.c @@ -26,7 +26,7 @@ #include "str.h" #include "variable.h" -#ifdef GLOBAL_DEBUGGING +#ifdef DEBUGGING #undef NDEBUG #else #ifndef NDEBUG @@ -66,7 +66,7 @@ case_size (size_t value_cnt) + 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 @@ case_nullify (struct ccase *c) 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 @@ case_create (struct ccase *c, size_t value_cnt) 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 @@ case_clone (struct ccase *clone, const struct ccase *orig) } 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 @@ case_move (struct ccase *dst, struct ccase *src) 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 @@ case_destroy (struct ccase *c) free (cd); } } -#endif /* GLOBAL_DEBUGGING */ +#endif /* DEBUGGING */ /* Resizes case C from OLD_CNT to NEW_CNT values. */ void @@ -183,7 +183,7 @@ case_try_create (struct ccase *c, size_t value_cnt) 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 @@ case_try_create (struct ccase *c, size_t value_cnt) } else { -#ifdef GLOBAL_DEBUGGING +#ifdef DEBUGGING c->this = c; #endif return 0; @@ -209,7 +209,7 @@ case_try_clone (struct ccase *clone, const struct ccase *orig) 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 @@ case_copy (struct ccase *dst, size_t dst_idx, 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 @@ case_to_values (const struct ccase *c, union value *output, 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 @@ case_from_values (struct ccase *c, const union value *input, 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 @@ case_data (const struct ccase *c, size_t idx) 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 @@ case_num (const struct ccase *c, size_t idx) 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 @@ case_str (const struct ccase *c, size_t idx) 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_data_rw (struct ccase *c, size_t idx) 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. */ diff --git a/src/data/case.h b/src/data/case.h index 6f6abeb5..e89cb44e 100644 --- a/src/data/case.h +++ b/src/data/case.h @@ -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 @@ struct case_data union value values[1]; /* Values. */ }; -#ifdef GLOBAL_DEBUGGING +#ifdef DEBUGGING #define CASE_INLINE #else #define CASE_INLINE static @@ -89,7 +89,7 @@ union value *case_data_all_rw (struct ccase *); void case_unshare (struct ccase *); -#ifndef GLOBAL_DEBUGGING +#ifndef DEBUGGING #include #include "str.h" @@ -183,6 +183,6 @@ case_data_rw (struct ccase *c, size_t idx) case_unshare (c); return &c->case_data->values[idx]; } -#endif /* !GLOBAL_DEBUGGING */ +#endif /* !DEBUGGING */ #endif /* case.h */ diff --git a/src/data/make-file.c b/src/data/make-file.c index 312f9fff..ed94f04c 100644 --- a/src/data/make-file.c +++ b/src/data/make-file.c @@ -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. */ diff --git a/src/data/sfm-private.h b/src/data/sfm-private.h index 9e691e78..caf7770d 100644 --- a/src/data/sfm-private.h +++ b/src/data/sfm-private.h @@ -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)) diff --git a/src/data/value.h b/src/data/value.h index 1c2a19cd..1fac5996 100644 --- a/src/data/value.h +++ b/src/data/value.h @@ -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 diff --git a/src/data/variable.h b/src/data/variable.h index 4a22d248..2bc3442d 100644 --- a/src/data/variable.h +++ b/src/data/variable.h @@ -40,6 +40,10 @@ enum var_type 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 { diff --git a/src/libpspp/hash.c b/src/libpspp/hash.c index fcf2b1f9..c3a7eb7e 100644 --- a/src/libpspp/hash.c +++ b/src/libpspp/hash.c @@ -567,7 +567,7 @@ hsh_count (struct hsh_table *h) /* Debug helpers. */ -#if GLOBAL_DEBUGGING +#if DEBUGGING #undef NDEBUG #include "message.h" #include diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h index e426483a..8ba77a98 100644 --- a/src/libpspp/hash.h +++ b/src/libpspp/hash.h @@ -62,7 +62,7 @@ void *hsh_first (struct hsh_table *, struct hsh_iterator *); 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 @@ void hsh_force_delete (struct hsh_table *, const void *); size_t hsh_count (struct hsh_table *); /* Debugging. */ -#if GLOBAL_DEBUGGING +#if DEBUGGING void hsh_dump (struct hsh_table *); #endif diff --git a/src/libpspp/pool.h b/src/libpspp/pool.h index 4f33dfa0..f2b01fe1 100644 --- a/src/libpspp/pool.h +++ b/src/libpspp/pool.h @@ -92,7 +92,7 @@ int pool_unregister (struct pool *, void *); 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 diff --git a/src/output/ascii.c b/src/output/ascii.c index 305100af..63f64be5 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -184,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 }; @@ -266,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; @@ -780,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 @@ -814,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 @@ -847,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 @@ -995,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; diff --git a/src/output/charts/ChangeLog b/src/output/charts/ChangeLog index 4a96aeb9..a41fcbef 100644 --- a/src/output/charts/ChangeLog +++ b/src/output/charts/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 4 13:24:39 2006 Ben Pfaff + + * automake.mk: Move definition of NO_CHARTS here from pref.h.orig. + Thu Mar 2 08:40:33 WST 2006 John Darrington * Moved files from src directory diff --git a/src/output/charts/automake.mk b/src/output/charts/automake.mk index cf3a4099..af24ef49 100644 --- a/src/output/charts/automake.mk +++ b/src/output/charts/automake.mk @@ -36,4 +36,6 @@ src_output_charts_libcharts_a_SOURCES = \ EXTRA_DIST += $(chart_sources) +AM_CPPFLAGS += -DNO_CHARTS + endif diff --git a/src/output/manager.c b/src/output/manager.c index 3647abb0..404c3bf2 100644 --- a/src/output/manager.c +++ b/src/output/manager.c @@ -93,7 +93,7 @@ static void output_entity (struct outp_driver *, struct som_entity *); void som_submit (struct som_entity *t) { -#if GLOBAL_DEBUGGING +#if DEBUGGING static int entry; assert (entry++ == 0); @@ -107,7 +107,7 @@ som_submit (struct som_entity *t) 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 @@ som_submit (struct som_entity *t) } -#if GLOBAL_DEBUGGING +#if DEBUGGING assert (--entry == 0); #endif } diff --git a/src/output/output.c b/src/output/output.c index 3f79a6a0..f6c20253 100644 --- a/src/output/output.c +++ b/src/output/output.c @@ -1258,7 +1258,7 @@ exit: struct outp_driver * outp_drivers (struct outp_driver *d) { -#if GLOBAL_DEBUGGING +#if DEBUGGING struct outp_driver *orig_d = d; #endif diff --git a/src/output/table.c b/src/output/table.c index 4a8e036e..4f5007c2 100644 --- a/src/output/table.c +++ b/src/output/table.c @@ -69,7 +69,7 @@ tab_create (int nc, int nr, int reallocable) 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 @@ tab_realloc (struct tab_table *t, int nc, int nr) int ro, co; assert (t != NULL); -#if GLOBAL_DEBUGGING +#if DEBUGGING assert (t->reallocable); #endif ro = t->row_ofs; @@ -251,7 +251,7 @@ tab_vline (struct tab_table *t, int style, int x, int y1, int y2) 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 @@ tab_box (struct tab_table *t, int f_h, int f_v, int i_h, int i_v, { 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 @@ tab_natural_width (struct tab_table *t, struct outp_driver *d, int c) 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 @@ tab_value (struct tab_table *table, int c, int r, unsigned char opt, 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 @@ tab_float (struct tab_table *table, int c, int r, unsigned char opt, 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 @@ tab_text (struct tab_table *table, int c, int r, unsigned opt, const char *text, 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 @@ tab_joint_text (struct tab_table *table, int x1, int y1, int x2, int y2, 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 @@ tab_raw (struct tab_table *table, int c, int r, unsigned opt, { 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 @@ tab_offset (struct tab_table *t, int col, int row) 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 @@ tabi_driver (struct outp_driver *driver) 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 @@ tabi_driver (struct outp_driver *driver) assert (t->dim != NULL); t->dim (t, d); -#if GLOBAL_DEBUGGING +#if DEBUGGING { int error = 0; diff --git a/src/output/table.h b/src/output/table.h index 0d35cc94..4fa45975 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -102,7 +102,7 @@ struct tab_table /* Editing info. */ int col_ofs, row_ofs; /* X and Y offsets. */ -#if GLOBAL_DEBUGGING +#if DEBUGGING int reallocable; /* Can table be reallocated? */ #endif }; -- 2.30.2