summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Pettenò <flameeyes@gmail.com>2006-06-30 07:45:31 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-06-30 07:45:31 +0000
commit72468a035adcd5b7e1ef245484be8e84273688bf (patch)
tree9169b9f11961fb3aa3b2c3de4f4ceaae26d8fc25
parente006c307fe98ebf76b7f7f41430b299ec5cb72c7 (diff)
make sure NDEBUG is not defined already before defining it
Patch by Diego 'Flameeyes' Petteno flameeyes AA gentoo PP org Original thread: Date: Jun 30, 2006 1:09 AM Subject: [Ffmpeg-devel] [PATCH] Avoid warning on NDEBUG redefinition Originally committed as revision 5557 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavutil/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index ae325122a5..c951f5b2b8 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -288,7 +288,7 @@ static inline float floorf(float f) {
/* debug stuff */
-# ifndef DEBUG
+# if !defined(DEBUG) && !defined(NDEBUG)
# define NDEBUG
# endif
# include <assert.h>