Limit scope of manually-defined NDEBUG. Purge a bunch of redundant #undef NDEBUG.

svn path=/trunk/netsurf/; revision=7593

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"

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"

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"

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"

css/css.c

@@ -93,7 +93,6 @@
 #include <math.h>
 #include <limits.h>
 #define CSS_INTERNALS
-#undef NDEBUG
 #include "utils/config.h"
 #include "content/content.h"
 #include "content/fetch.h"

css/ruleset.c

@@ -37,16 +37,15 @@
 #include <strings.h>
 #include <math.h>
 #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,

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 <assert.h>
 #include <string.h>
 #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 */

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"

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;

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 <gdk/gdkkeysyms.h>

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"

render/box_normalise.c

@@ -31,6 +31,7 @@
 #include "desktop/gui.h"
 #define NDEBUG
 #include "utils/log.h"
+#undef NDEBUG
 #include "utils/talloc.h"
 
 

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"
 

render/table.c

@@ -27,6 +27,7 @@
 #include "render/table.h"
 #define NDEBUG
 #include "utils/log.h"
+#undef NDEBUG
 #include "utils/talloc.h"
 
 

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"
 

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"