summaryrefslogtreecommitdiffstats
path: root/libfaad2
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-08-09 11:35:41 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-08-09 11:35:41 +0000
commit6f0da163dde71e51fa67e47139476d0715323b78 (patch)
tree71646ac0202a7d984ad37492541a6b122e14a58a /libfaad2
parent185bc3320ff3ef743f43453146f6f4a95ddb4ef5 (diff)
downloadmpv-6f0da163dde71e51fa67e47139476d0715323b78.tar.bz2
mpv-6f0da163dde71e51fa67e47139476d0715323b78.tar.xz
Move some more compiler flags to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24043 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2')
-rw-r--r--libfaad2/common.h6
-rw-r--r--libfaad2/local_changes.diff14
2 files changed, 10 insertions, 10 deletions
diff --git a/libfaad2/common.h b/libfaad2/common.h
index e43e11ed13..6fb5a12b08 100644
--- a/libfaad2/common.h
+++ b/libfaad2/common.h
@@ -35,13 +35,15 @@
extern "C" {
#endif
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
/* Allow build on Cygwin*/
#if defined(__CYGWIN__)
#define __STRICT_ANSI__
#endif
-#include "../config.h"
-
#define INLINE __inline
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
#define ALIGN __declspec(align(16))
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff
index 084c44bb24..d7b1a7b081 100644
--- a/libfaad2/local_changes.diff
+++ b/libfaad2/local_changes.diff
@@ -33,19 +33,17 @@
**/
#ifndef __COMMON_H__
-@@ -32,10 +35,13 @@
- extern "C" {
- #endif
+@@ -32,8 +35,13 @@
--#ifdef HAVE_CONFIG_H
--# include "../config.h"
+ #ifdef HAVE_CONFIG_H
+ # include "../config.h"
+ #endif
++
+/* Allow build on Cygwin*/
+#if defined(__CYGWIN__)
+#define __STRICT_ANSI__
- #endif
++#endif
-+#include "../config.h"
-+
#define INLINE __inline
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
#define ALIGN __declspec(align(16))