libfaad2/local_changes.diff

   1 --- libfaad/bits.h      2004-03-11 14:32:39.000000000 +0100
   2 +++ libfaad2/bits.h     2004-06-24 10:47:02.000000000 +0200
   3 @@ -58,7 +61,7 @@
   4
   5  #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__)
   6  #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
   7 -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__)
   8 +#elif defined(LINUX) || defined(DJGPP)
   9  #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
  10  #else
  11  #define BSWAP(a) \
  12 --- libfaad/common.h    2004-06-30 14:45:56.000000000 +0200
  13 +++ libfaad2/common.h   2004-10-19 03:16:03.000000000 +0200
  14 @@ -32,10 +35,13 @@
  15  extern "C" {
  16  #endif
  17
  18 -#ifdef HAVE_CONFIG_H
  19 -#  include "../config.h"
  20 +/* Allow build on Cygwin*/
  21 +#if defined(__CYGWIN__)
  22 +#define __STRICT_ANSI__
  23  #endif
  24
  25 +#include "../config.h"
  26 +
  27  #define INLINE __inline
  28  #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
  29  #define ALIGN __declspec(align(16))
  30 @@ -117,6 +123,9 @@
  31  # ifdef MAIN_DEC
  32  #  undef MAIN_DEC
  33  # endif
  34 +# ifdef SBR_DEC
  35 +#  undef SBR_DEC
  36 +# endif
  37  #endif // FIXED_POINT
  38
  39  #ifdef DRM
  40 @@ -157,6 +166,7 @@
  41
  42  #include <stdlib.h>
  43
  44 +#if 0
  45  typedef unsigned __int64 uint64_t;
  46  typedef unsigned __int32 uint32_t;
  47  typedef unsigned __int16 uint16_t;
  48 @@ -165,11 +175,31 @@
  49  typedef __int32 int32_t;
  50  typedef __int16 int16_t;
  51  typedef __int8  int8_t;
  52 +#else
  53 +#include <inttypes.h>
  54 +#endif
  55 +
  56  typedef float float32_t;
  57
  58
  59  #else
  60
  61 +/* #undef HAVE_FLOAT32_T */
  62 +/* Define if you have the <inttypes.h> header file. */
  63 +#define HAVE_INTTYPES_H 1
  64 +
  65 +/* Define if you have the `memcpy' function. */
  66 +#define HAVE_MEMCPY 1
  67 +
  68 +/* Define if you have the <stdint.h> header file. */
  69 +#define HAVE_STDINT_H 1
  70 +
  71 +/* Define if you have the `strchr' function. */
  72 +#define HAVE_STRCHR 1
  73 +
  74 +/* Define if you have the ANSI C header files. */
  75 +#define STDC_HEADERS 1
  76 +
  77  #include <stdio.h>
  78  #if HAVE_SYS_TYPES_H
  79  # include <sys/types.h>
  80 @@ -311,7 +341,7 @@
  81          }
  82          return i;
  83      }
  84 -  #elif (defined(__i386__) && defined(__GNUC__))
  85 +  #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
  86      #define HAS_LRINTF
  87      // from http://www.stereopsis.com/FPU.html
  88      static INLINE int lrintf(float f)
  89 @@ -340,6 +370,8 @@
  90
  91    #else
  92
  93 +#include <math.h>
  94 +
  95  #ifdef HAVE_LRINTF
  96  #  define HAS_LRINTF
  97  #  define _ISOC9X_SOURCE 1
  98 @@ -348,8 +380,6 @@
  99  #  define __USE_ISOC99   1
 100  #endif
 101
 102 -    #include <math.h>
 103 -
 104  #ifdef HAVE_SINF
 105  #  define sin sinf
 106  #error