From 856bc222f82b5d0d8d513acfc4293cf185250fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Mon, 24 Mar 2014 04:56:25 +0000 Subject: [PATCH] libflac: changed HAVE_CONFIG_H checks to be as intended - will be fixed upstream as well (nw) --- src/lib/lib.mak | 2 +- src/lib/libflac/include/private/cpu.h | 2 +- src/lib/libflac/include/private/fixed.h | 2 +- src/lib/libflac/include/private/float.h | 2 +- src/lib/libflac/include/private/lpc.h | 2 +- src/lib/libflac/include/private/memory.h | 2 +- src/lib/libflac/include/private/window.h | 2 +- src/lib/libflac/include/share/alloc.h | 2 +- src/lib/libflac/libFLAC/bitmath.c | 2 +- src/lib/libflac/libFLAC/bitreader.c | 2 +- src/lib/libflac/libFLAC/bitwriter.c | 2 +- src/lib/libflac/libFLAC/cpu.c | 2 +- src/lib/libflac/libFLAC/crc.c | 2 +- src/lib/libflac/libFLAC/fixed.c | 2 +- src/lib/libflac/libFLAC/float.c | 2 +- src/lib/libflac/libFLAC/format.c | 2 +- src/lib/libflac/libFLAC/lpc.c | 2 +- src/lib/libflac/libFLAC/md5.c | 2 +- src/lib/libflac/libFLAC/memory.c | 2 +- src/lib/libflac/libFLAC/metadata_iterators.c | 2 +- src/lib/libflac/libFLAC/metadata_object.c | 2 +- src/lib/libflac/libFLAC/stream_decoder.c | 2 +- src/lib/libflac/libFLAC/stream_encoder.c | 2 +- src/lib/libflac/libFLAC/stream_encoder_framing.c | 2 +- src/lib/libflac/libFLAC/window.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/lib/lib.mak b/src/lib/lib.mak index ad41a03718e..8c5d817fef9 100644 --- a/src/lib/lib.mak +++ b/src/lib/lib.mak @@ -348,7 +348,7 @@ else ARCHFLAGS = -DWORDS_BIGENDIAN=0 endif -FLACOPTS=-DFLAC__NO_ASM -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H=0 -DFLAC__HAS_OGG=0 -Wno-unused-function $(ARCHFLAGS) -O0 +FLACOPTS=-DFLAC__NO_ASM -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFLAC__HAS_OGG=0 -Wno-unused-function $(ARCHFLAGS) -O0 ifdef MSVC_BUILD # vconv will convert the \" to just a " FLACOPTS += -DVERSION=\\\"1.2.1\\\" diff --git a/src/lib/libflac/include/private/cpu.h b/src/lib/libflac/include/private/cpu.h index b0526352695..651bb224f2a 100644 --- a/src/lib/libflac/include/private/cpu.h +++ b/src/lib/libflac/include/private/cpu.h @@ -34,7 +34,7 @@ #include "FLAC/ordinals.h" -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include #endif diff --git a/src/lib/libflac/include/private/fixed.h b/src/lib/libflac/include/private/fixed.h index f5b2cda616b..6656b796bec 100644 --- a/src/lib/libflac/include/private/fixed.h +++ b/src/lib/libflac/include/private/fixed.h @@ -32,7 +32,7 @@ #ifndef FLAC__PRIVATE__FIXED_H #define FLAC__PRIVATE__FIXED_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include #endif diff --git a/src/lib/libflac/include/private/float.h b/src/lib/libflac/include/private/float.h index 5e1293bb55f..73313f6dbf8 100644 --- a/src/lib/libflac/include/private/float.h +++ b/src/lib/libflac/include/private/float.h @@ -32,7 +32,7 @@ #ifndef FLAC__PRIVATE__FLOAT_H #define FLAC__PRIVATE__FLOAT_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include #endif diff --git a/src/lib/libflac/include/private/lpc.h b/src/lib/libflac/include/private/lpc.h index 501d5758da1..2cb139b4bfd 100644 --- a/src/lib/libflac/include/private/lpc.h +++ b/src/lib/libflac/include/private/lpc.h @@ -32,7 +32,7 @@ #ifndef FLAC__PRIVATE__LPC_H #define FLAC__PRIVATE__LPC_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include #endif diff --git a/src/lib/libflac/include/private/memory.h b/src/lib/libflac/include/private/memory.h index cc036124ffb..38a9ffe0711 100644 --- a/src/lib/libflac/include/private/memory.h +++ b/src/lib/libflac/include/private/memory.h @@ -32,7 +32,7 @@ #ifndef FLAC__PRIVATE__MEMORY_H #define FLAC__PRIVATE__MEMORY_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include #endif diff --git a/src/lib/libflac/include/private/window.h b/src/lib/libflac/include/private/window.h index 2be90bc65cd..01e0fc46c94 100644 --- a/src/lib/libflac/include/private/window.h +++ b/src/lib/libflac/include/private/window.h @@ -32,7 +32,7 @@ #ifndef FLAC__PRIVATE__WINDOW_H #define FLAC__PRIVATE__WINDOW_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include #endif diff --git a/src/lib/libflac/include/share/alloc.h b/src/lib/libflac/include/share/alloc.h index 812aa69d0b6..3fdfad2991a 100644 --- a/src/lib/libflac/include/share/alloc.h +++ b/src/lib/libflac/include/share/alloc.h @@ -19,7 +19,7 @@ #ifndef FLAC__SHARE__ALLOC_H #define FLAC__SHARE__ALLOC_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/bitmath.c b/src/lib/libflac/libFLAC/bitmath.c index 27e25f0f7ac..af19c35445a 100644 --- a/src/lib/libflac/libFLAC/bitmath.c +++ b/src/lib/libflac/libFLAC/bitmath.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/bitreader.c b/src/lib/libflac/libFLAC/bitreader.c index ca9ab161a98..e2a4ba3bd16 100644 --- a/src/lib/libflac/libFLAC/bitreader.c +++ b/src/lib/libflac/libFLAC/bitreader.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/bitwriter.c b/src/lib/libflac/libFLAC/bitwriter.c index e3e7ad164ef..089ff872b59 100644 --- a/src/lib/libflac/libFLAC/bitwriter.c +++ b/src/lib/libflac/libFLAC/bitwriter.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/cpu.c b/src/lib/libflac/libFLAC/cpu.c index 8e97d45e493..e5ea78ea37c 100644 --- a/src/lib/libflac/libFLAC/cpu.c +++ b/src/lib/libflac/libFLAC/cpu.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/crc.c b/src/lib/libflac/libFLAC/crc.c index 463ab65ef83..52574f87c80 100644 --- a/src/lib/libflac/libFLAC/crc.c +++ b/src/lib/libflac/libFLAC/crc.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/fixed.c b/src/lib/libflac/libFLAC/fixed.c index 1a3aac090f6..e92faf3d8ff 100644 --- a/src/lib/libflac/libFLAC/fixed.c +++ b/src/lib/libflac/libFLAC/fixed.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/float.c b/src/lib/libflac/libFLAC/float.c index 8e19280207b..60fa7e8371a 100644 --- a/src/lib/libflac/libFLAC/float.c +++ b/src/lib/libflac/libFLAC/float.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/format.c b/src/lib/libflac/libFLAC/format.c index a3f93ddc78c..3480905108a 100644 --- a/src/lib/libflac/libFLAC/format.c +++ b/src/lib/libflac/libFLAC/format.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/lpc.c b/src/lib/libflac/libFLAC/lpc.c index 2094d684631..00bbab44c1c 100644 --- a/src/lib/libflac/libFLAC/lpc.c +++ b/src/lib/libflac/libFLAC/lpc.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/md5.c b/src/lib/libflac/libFLAC/md5.c index 003a61097e9..3cfebd23675 100644 --- a/src/lib/libflac/libFLAC/md5.c +++ b/src/lib/libflac/libFLAC/md5.c @@ -1,4 +1,4 @@ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/memory.c b/src/lib/libflac/libFLAC/memory.c index 9fc356c5454..48f381b7e8c 100644 --- a/src/lib/libflac/libFLAC/memory.c +++ b/src/lib/libflac/libFLAC/memory.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/metadata_iterators.c b/src/lib/libflac/libFLAC/metadata_iterators.c index 15362f7b507..f88795bcf82 100644 --- a/src/lib/libflac/libFLAC/metadata_iterators.c +++ b/src/lib/libflac/libFLAC/metadata_iterators.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/metadata_object.c b/src/lib/libflac/libFLAC/metadata_object.c index a1465f5bb51..6f8bccf4563 100644 --- a/src/lib/libflac/libFLAC/metadata_object.c +++ b/src/lib/libflac/libFLAC/metadata_object.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/stream_decoder.c b/src/lib/libflac/libFLAC/stream_decoder.c index d2cf2dcc79d..198d5dcc883 100644 --- a/src/lib/libflac/libFLAC/stream_decoder.c +++ b/src/lib/libflac/libFLAC/stream_decoder.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/stream_encoder.c b/src/lib/libflac/libFLAC/stream_encoder.c index 83545c38a44..afc79850096 100644 --- a/src/lib/libflac/libFLAC/stream_encoder.c +++ b/src/lib/libflac/libFLAC/stream_encoder.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/stream_encoder_framing.c b/src/lib/libflac/libFLAC/stream_encoder_framing.c index 939955bf2d6..621b34c8228 100644 --- a/src/lib/libflac/libFLAC/stream_encoder_framing.c +++ b/src/lib/libflac/libFLAC/stream_encoder_framing.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/src/lib/libflac/libFLAC/window.c b/src/lib/libflac/libFLAC/window.c index cd689c573d4..b35c72efeac 100644 --- a/src/lib/libflac/libFLAC/window.c +++ b/src/lib/libflac/libFLAC/window.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif