From b321beb4ac88fb3d032b0f0132a8ce7348b52f89 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Wed, 19 Mar 2008 20:52:05 +0200
Subject: [PATCH] Use NDEBUG

---
 modules/access/http.c            | 2 +-
 modules/audio_output/sdl.c       | 2 +-
 modules/gui/macosx/playlist.m    | 2 +-
 modules/mux/mpeg/pes.c           | 2 +-
 modules/video_output/sdl.c       | 2 +-
 src/video_output/vout_pictures.c | 2 +-
 src/vlc.c                        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index 0f74a5dd6c..3fb005293c 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -332,7 +332,7 @@ connect:
             if( p_access->b_die || Connect( p_access, 0 ) )
                 goto error;
 
-#ifdef DEBUG
+#ifndef NDEBUG
         case 0:
             break;
 
diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index 3e98609e4e..fbf256d945 100644
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -94,7 +94,7 @@ static int Open ( vlc_object_t *p_this )
     /* Win32 SDL implementation doesn't support SDL_INIT_EVENTTHREAD yet */
     i_flags |= SDL_INIT_EVENTTHREAD;
 #endif
-#ifdef DEBUG
+#ifndef NDEBUG
     /* In debug mode you may want vlc to dump a core instead of staying
      * stuck */
     i_flags |= SDL_INIT_NOPARACHUTE;
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 17ce0f44b2..47e060be8c 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1384,7 +1384,7 @@
 
     [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
                                                     [o_value pointerValue]]];
-#ifdef DEBUG
+#ifndef NDEBUG
     msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] );
 #endif
     return o_value;
diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index ed199c2be1..2e04a21509 100644
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -273,7 +273,7 @@ int E_( EStoPES )( sout_instance_t *p_sout, block_t **pp_pes, block_t *p_es,
 
     *pp_pes = p_pes = NULL;
 
-#ifdef DEBUG
+#ifndef NDEBUG
     memset( header, 0, 50 );
 #endif
 
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 30eb07eab2..3ed1de7168 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -198,7 +198,7 @@ static int Open ( vlc_object_t *p_this )
     /* Win32 SDL implementation doesn't support SDL_INIT_EVENTTHREAD yet*/
                 | SDL_INIT_EVENTTHREAD
 #endif
-#ifdef DEBUG
+#ifndef NDEBUG
     /* In debug mode you may want vlc to dump a core instead of staying
      * stuck */
                 | SDL_INIT_NOPARACHUTE
diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 3099b86156..b95963967b 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -217,7 +217,7 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
 {
     vlc_mutex_lock( &p_vout->picture_lock );
 
-#ifdef DEBUG
+#ifndef NDEBUG
     /* Check if picture status is valid */
     if( (p_pic->i_status != RESERVED_PICTURE) &&
         (p_pic->i_status != RESERVED_DATED_PICTURE) &&
diff --git a/src/vlc.c b/src/vlc.c
index b8dd9bb958..55fed1d3c6 100644
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -92,7 +92,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 #endif
 
 #ifdef HAVE_PUTENV
-#   ifdef DEBUG
+#   ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
     putenv( (char*)"MALLOC_CHECK_=2" );
 #       ifdef __APPLE__
-- 
2.39.2