Use NDEBUG

diff --git a/modules/access/http.c b/modules/access/http.c
index 0f74a5dd6c3d0c3d79fd0f9b34cbcc72382fc6a2..3fb005293ca953d5c7d8e54104fc92fa6b05e599 100644 (file)
--- 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 3e98609e4eb3ef0db5ba486d8933fd4d7206fea7..fbf256d94596e5db54c4294ed50387aec827206c 100644 (file)
--- 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 17ce0f44b298885fa718b8169a58d7d205a6e840..47e060be8cfa8a0329c73ac98432b1223159dccb 100644 (file)
--- 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 ed199c2be1ccd75acf3afc57fc4a757e04d889c0..2e04a215091359097348c1b3a1c19ca90bf080ce 100644 (file)
--- 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 30eb07eab22cdf1c57499981a6cd909458e08ab9..3ed1de7168dc37347e0deb763a40d4461d8b0032 100644 (file)
--- 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 3099b861566a495c173e58994663641198804778..b95963967b7b886b3d6a97e6ff725279b517fa23 100644 (file)
--- 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 b8dd9bb9586876aa049143363252c0f4a79ae8da..55fed1d3c6d991a7c4c9879e066ccdeb8d180480 100644 (file)
--- 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__