threads: Consistenly use NDEBUG

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index d10ca4d24ae7ef79ab92f3941e36f55d70c57dac..c2eb0bd82944a2d4dbe9252b4e064f5ef0f28085 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -52,7 +52,7 @@
 #   include <pthread.h>
     /* Needed for pthread_cond_timedwait */
 #   include <errno.h>
-#   ifdef DEBUG
+#   ifndef NDEBUG
 #      include <time.h>
 #   endif
 

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 8d52580bb72142c3cdae94b7c1b73781084b8972..51801cd7ff0613703d3639363c4705c994581909 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -281,7 +281,7 @@ int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex )
     return B_OK;
 
 #elif defined( LIBVLC_USE_PTHREAD )
-# if defined(DEBUG)
+# ifndef NDEBUG
     {
         /* Create error-checking mutex to detect problems more easily. */
         pthread_mutexattr_t attr;
@@ -298,7 +298,7 @@ int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex )
         pthread_mutexattr_destroy( &attr );
         return( i_result );
     }
-# endif
+# endif /* NDEBUG */
     return pthread_mutex_init( &p_mutex->mutex, NULL );
 
 #endif
@@ -318,7 +318,7 @@ int __vlc_mutex_init_recursive( vlc_object_t *p_this, vlc_mutex_t *p_mutex )
     int                 i_result;
 
     pthread_mutexattr_init( &attr );
-# if defined(DEBUG)
+# ifndef NDEBUG
     /* Create error-checking mutex to detect problems more easily. */
 #   if defined(SYS_LINUX)
     pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );