From 243c1ba03f0b7031b0c8dce7036ae5b583f252c0 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 28 May 2009 10:39:53 +0000 Subject: Limit scope of manually-defined NDEBUG. Purge a bunch of redundant #undef NDEBUG. svn path=/trunk/netsurf/; revision=7593 --- beos/beos_scaffolding.cpp | 1 - beos/beos_window.cpp | 1 - content/fetch.c | 1 - content/fetchers/fetch_curl.c | 1 - css/css.c | 1 - css/ruleset.c | 5 ++--- desktop/knockout.c | 5 +++-- desktop/textinput.c | 1 + gtk/gtk_scaffolding.c | 1 - gtk/gtk_window.c | 1 - render/box_construct.c | 1 - render/box_normalise.c | 1 + render/layout.c | 1 + render/table.c | 1 + riscos/buffer.c | 1 - utils/utils.c | 1 + 16 files changed, 10 insertions(+), 14 deletions(-) diff --git a/beos/beos_scaffolding.cpp b/beos/beos_scaffolding.cpp index ef5b12873..cd6f01e38 100644 --- a/beos/beos_scaffolding.cpp +++ b/beos/beos_scaffolding.cpp @@ -55,7 +55,6 @@ extern "C" { #include "render/html.h" #include "utils/messages.h" #include "utils/utils.h" -#undef NDEBUG #include "utils/log.h" } #include "beos/beos_gui.h" diff --git a/beos/beos_window.cpp b/beos/beos_window.cpp index b18504b2c..9214b75f8 100644 --- a/beos/beos_window.cpp +++ b/beos/beos_window.cpp @@ -26,7 +26,6 @@ extern "C" { #include "desktop/options.h" #include "desktop/selection.h" #include "desktop/textinput.h" -#undef NDEBUG #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" diff --git a/content/fetch.c b/content/fetch.c index 5ea6fba60..f3afa0a1f 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -43,7 +43,6 @@ #include "desktop/netsurf.h" #include "desktop/options.h" #include "render/form.h" -#undef NDEBUG #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" diff --git a/content/fetchers/fetch_curl.c b/content/fetchers/fetch_curl.c index eb200ba46..33425a352 100644 --- a/content/fetchers/fetch_curl.c +++ b/content/fetchers/fetch_curl.c @@ -45,7 +45,6 @@ #include "desktop/netsurf.h" #include "desktop/options.h" #include "render/form.h" -#undef NDEBUG #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" diff --git a/css/css.c b/css/css.c index b493764de..133b9ec92 100644 --- a/css/css.c +++ b/css/css.c @@ -93,7 +93,6 @@ #include #include #define CSS_INTERNALS -#undef NDEBUG #include "utils/config.h" #include "content/content.h" #include "content/fetch.h" diff --git a/css/ruleset.c b/css/ruleset.c index 30d8c8ffd..5e67b6364 100644 --- a/css/ruleset.c +++ b/css/ruleset.c @@ -37,16 +37,15 @@ #include #include #define CSS_INTERNALS -#define NDEBUG #include "css/css.h" #include "content/content.h" #include "desktop/options.h" +#define NDEBUG #include "utils/log.h" +#undef NDEBUG #include "utils/url.h" #include "utils/utils.h" - - static bool css_compare_selectors(const struct css_selector *n0, const struct css_selector *n1); static int parse_length(struct css_length * const length, diff --git a/desktop/knockout.c b/desktop/knockout.c index d99c96909..b1075f3cb 100644 --- a/desktop/knockout.c +++ b/desktop/knockout.c @@ -48,7 +48,7 @@ * |#################| |#################| * +-----------------+ +-----------------+ * - * With knockoout rendering, the bottom rectangle is split up into smaller + * With knockout rendering, the bottom rectangle is split up into smaller * ones and each pixel is just plotted once: * * +-----------------+ @@ -62,13 +62,14 @@ * +-----------------+ */ -#define NDEBUG #include #include #include "desktop/knockout.h" #include "desktop/plotters.h" #include "image/bitmap.h" +#define NDEBUG #include "utils/log.h" +#undef NDEBUG #define KNOCKOUT_ENTRIES 3072 /* 40 bytes each */ #define KNOCKOUT_BOXES 768 /* 28 bytes each */ diff --git a/desktop/textinput.c b/desktop/textinput.c index 927088331..34425e522 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -38,6 +38,7 @@ #include "render/layout.h" #define NDEBUG #include "utils/log.h" +#undef NDEBUG #include "utils/talloc.h" #include "utils/utf8.h" #include "utils/utils.h" diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index 685495ff4..d6c4f1e55 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -60,7 +60,6 @@ #include "utils/utils.h" #include "utils/url.h" -#undef NDEBUG #include "utils/log.h" struct gtk_history_window; diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index ba138d0c8..57ac59ca5 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -30,7 +30,6 @@ #include "gtk/gtk_plotters.h" #include "gtk/gtk_schedule.h" #include "gtk/gtk_tabs.h" -#undef NDEBUG #include "utils/log.h" #include "utils/utils.h" #include diff --git a/render/box_construct.c b/render/box_construct.c index ba6c801a3..1f6c628d2 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -44,7 +44,6 @@ #include "render/html.h" #include "desktop/gui.h" #include "utils/locale.h" -//#define NDEBUG #include "utils/log.h" #include "utils/messages.h" #include "utils/talloc.h" diff --git a/render/box_normalise.c b/render/box_normalise.c index 2a6f759a0..865433e26 100644 --- a/render/box_normalise.c +++ b/render/box_normalise.c @@ -31,6 +31,7 @@ #include "desktop/gui.h" #define NDEBUG #include "utils/log.h" +#undef NDEBUG #include "utils/talloc.h" diff --git a/render/layout.c b/render/layout.c index f78feced1..268a9a89c 100644 --- a/render/layout.c +++ b/render/layout.c @@ -49,6 +49,7 @@ #include "render/layout.h" #define NDEBUG #include "utils/log.h" +#undef NDEBUG #include "utils/talloc.h" #include "utils/utils.h" diff --git a/render/table.c b/render/table.c index 9423401f3..d3134f687 100644 --- a/render/table.c +++ b/render/table.c @@ -27,6 +27,7 @@ #include "render/table.h" #define NDEBUG #include "utils/log.h" +#undef NDEBUG #include "utils/talloc.h" diff --git a/riscos/buffer.c b/riscos/buffer.c index 70f8700b0..4c35c9ad2 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -32,7 +32,6 @@ #include "riscos/wimp.h" #include "riscos/wimputils.h" #include "utils/log.h" -//#define NDEBUG #define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)" //#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct" diff --git a/utils/utils.c b/utils/utils.c index 9f72be0ee..ad76c5e30 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -34,6 +34,7 @@ #include "utils/config.h" #define NDEBUG #include "utils/log.h" +#undef NDEBUG #include "utils/messages.h" #include "utils/utf8.h" #include "utils/utils.h" -- cgit v1.2.3