diff options
Diffstat (limited to 'src/libfaad/common.h')
| -rw-r--r-- | src/libfaad/common.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/libfaad/common.h b/src/libfaad/common.h index 5da3661bb..47832e648 100644 --- a/src/libfaad/common.h +++ b/src/libfaad/common.h @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: common.h,v 1.16 2005/10/30 01:21:53 tmmm Exp $ +** $Id: common.h,v 1.17 2006/06/17 20:43:57 dgp85 Exp $ **/ #ifndef __COMMON_H__ @@ -32,10 +32,12 @@ extern "C" { #endif -#ifdef HAVE_CONFIG_H -# include "../config.h" +#ifdef __CYGWIN__ +#define __STRICT_ANSI__ #endif +#include "../config.h" + #define INLINE __inline #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) #define ALIGN __declspec(align(16)) @@ -61,7 +63,7 @@ extern "C" { /* Use if target platform has address generators with autoincrement */ //#define PREFER_POINTERS -#ifdef _WIN32_WCE +#if defined(_WIN32_WCE) || defined(__arm__) #define FIXED_POINT #endif @@ -117,6 +119,9 @@ extern "C" { # ifdef MAIN_DEC # undef MAIN_DEC # endif +# ifdef SBR_DEC +# undef SBR_DEC +# endif #endif // FIXED_POINT #ifdef DRM @@ -326,6 +331,8 @@ char *strchr(), *strrchr(); #else +#include <math.h> + #ifdef HAVE_LRINTF # define HAS_LRINTF # define _ISOC9X_SOURCE 1 @@ -334,8 +341,6 @@ char *strchr(), *strrchr(); # define __USE_ISOC99 1 #endif - #include <math.h> - #ifdef HAVE_SINF # define sin sinf #error |