sna: Don't mess with NDEBUG

This is set in configure and redefining it later inside the C files just
leads to trouble and broken compilation.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

19 files changed, 0 insertions, 38 deletions

diff --git a/src/sna/blt.c b/src/sna/blt.c
index ac20372e..3b07d834 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -34,8 +34,6 @@
 #if DEBUG_BLT
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 void
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index d2a296cc..2577493b 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -41,8 +41,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_COMPOSITE 0
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index eca841ec..bf688411 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -40,8 +40,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_COMPOSITE 0
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index c603e67a..8f59dc12 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -47,8 +47,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 /* gen4 has a serious issue with its shaders that we need to flush
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 3006bd15..c48e828e 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -47,8 +47,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define DBG_NO_STATE_CACHE 0
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index b7f0ed08..51d26c8d 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -47,8 +47,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_COMPOSITE 0
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 4667badc..3be87b71 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -47,8 +47,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_COMPOSITE 0
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 4827fb8e..86cde014 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -72,8 +72,6 @@ static inline void list_replace(struct list *old,
 #if DEBUG_KGEM
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define PAGE_SIZE 4096
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index c285c974..eb8295c4 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -52,8 +52,6 @@
 #if DEBUG_ACCEL
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define FORCE_GPU_ONLY 0
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index ffe81df5..1630b35f 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -44,8 +44,6 @@
 #if DEBUG_BLT
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_BLT_COMPOSITE 0
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 0373bad4..7c599be3 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -39,8 +39,6 @@
 #if DEBUG_COMPOSITE
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 static void dst_move_area_to_cpu(PicturePtr picture,
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 2fcc060f..f7240264 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -72,8 +72,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #if DEBUG_DRI
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_TRIPPLE_BUFFER 0
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 83abdb32..3e3f65cd 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -78,8 +78,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #if DEBUG_DRIVER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 static OptionInfoRec sna_options[] = {
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 7b98b0c8..7c4b73f9 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -73,8 +73,6 @@
 #if DEBUG_GLYPHS
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define FALLBACK 0
diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c
index f97b88a4..a36adc96 100644
--- a/src/sna/sna_io.c
+++ b/src/sna/sna_io.c
@@ -38,8 +38,6 @@
 #if DEBUG_IO
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define PITCH(x, y) ALIGN((x)*(y), 4)
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 4017f919..badde7c1 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -34,8 +34,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_REDIRECT 0
diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index 295936b7..bab299eb 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -37,8 +37,6 @@
 #if DEBUG_RENDER
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 struct sna_tile_state {
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 80b47336..a6b8562e 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -41,8 +41,6 @@
 #if DEBUG_TRAPEZOIDS
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define NO_ACCEL 0
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 6ff08689..64d54ec9 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -42,8 +42,6 @@
 #if DEBUG_VIDEO_TEXTURED
 #undef DBG
 #define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
 #endif
 
 #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)