[vlc-commits] commit: libflac installs its own assert.h which fails to define assert() ( Rafaël Carré )

git at videolan.org git at videolan.org
Thu Jun 17 05:50:08 CEST 2010


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Jun 17 05:36:24 2010 +0200| [e62742a716f0ed1ee72b433f590a05532a16c5ff] | committer: Rafaël Carré 

libflac installs its own assert.h which fails to define assert()

Define assert() to no-op

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e62742a716f0ed1ee72b433f590a05532a16c5ff
---

 modules/codec/flac.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 97204c0..ffd38b2 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -45,6 +45,11 @@
 #   define USE_NEW_FLAC_API
 #endif
 
+#ifndef assert
+    /* workaround libflac overriding assert.h system header */
+#   define assert(x) do {} while(0)
+#endif
+
 /*****************************************************************************
  * decoder_sys_t : FLAC decoder descriptor
  *****************************************************************************/



More information about the vlc-commits mailing list