summaryrefslogtreecommitdiffstats
path: root/libfaad2
diff options
context:
space:
mode:
Diffstat (limited to 'libfaad2')
-rw-r--r--libfaad2/common.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/libfaad2/common.h b/libfaad2/common.h
index 0706390169..58c9b110c4 100644
--- a/libfaad2/common.h
+++ b/libfaad2/common.h
@@ -39,9 +39,7 @@ extern "C" {
#define __STRICT_ANSI__
#endif
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "../config.h"
#define INLINE __inline
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
@@ -201,10 +199,6 @@ typedef float float32_t;
/* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
#include <stdio.h>
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -375,6 +369,8 @@ char *strchr(), *strrchr();
#else
+#include <math.h>
+
#ifdef HAVE_LRINTF
# define HAS_LRINTF
# define _ISOC9X_SOURCE 1
@@ -383,8 +379,6 @@ char *strchr(), *strrchr();
# define __USE_ISOC99 1
#endif
- #include <math.h>
-
#ifdef HAVE_SINF
# define sin sinf
#error