Fix flac compilation
authorChristophe Mutricy <xtophe@videolan.org>
Wed, 26 Sep 2007 21:56:48 +0000 (21:56 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Wed, 26 Sep 2007 21:56:48 +0000 (21:56 +0000)
extras/contrib/src/Makefile
extras/contrib/src/Patches/flac-win32.patch [new file with mode: 0644]

index 9557dc1..ba76478 100644 (file)
@@ -806,6 +806,9 @@ flac: flac-$(FLAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifneq ($(HOST),$(BUILD))
        (patch -p0 < Patches/flac-cross.patch)
+endif
+ifdef HAVE_WIN32
+       patch -p0 < Patches/flac-win32.patch
 endif
        cd $@ && autoconf
 
diff --git a/extras/contrib/src/Patches/flac-win32.patch b/extras/contrib/src/Patches/flac-win32.patch
new file mode 100644 (file)
index 0000000..25e4386
--- /dev/null
@@ -0,0 +1,12 @@
+diff -ur flac-1.2.1/include/share/alloc.h flac/include/share/alloc.h
+--- flac-1.2.1/include/share/alloc.h   2007-09-12 06:32:21.000000000 +0100
++++ flac/include/share/alloc.h 2007-09-25 20:54:09.000000000 +0100
+@@ -28,7 +28,7 @@
+  */
+ #include <limits.h> /* for SIZE_MAX */
+-#if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__
++#if !defined _MSC_VER && !defined __EMX__
+ #include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
+ #endif
+ #include <stdlib.h> /* for size_t, malloc(), etc */