[Ffmpeg-cvslog] r7068 - in trunk: configure libavutil/common.h

[mru]

Author: mru
Date: Tue Nov 14 21:00:55 2006
New Revision: 7068

Modified:
   trunk/configure
   trunk/libavutil/common.h

Log:
remove workaround for missing inttypes.h


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Nov 14 21:00:55 2006
@@ -408,12 +408,10 @@
     dcbzl
     dlfcn
     dlopen
-    fast_int
     freetype2
     gprof
     imlib2
     inet_aton
-    inttypes
     localtime_r
     lrintf
     malloc_h
@@ -560,8 +558,6 @@
 installstrip="-s"
 extralibs="-lm"
 bigendian="no"
-inttypes="yes"
-fast_int="yes"
 vhook="default"
 avisynth="no"
 dlfcn="no"
@@ -1387,20 +1383,6 @@
 fi
 
 # ---
-# *inttypes.h* test
-check_header inttypes.h || inttypes=no
-
-# ---
-# *int_fast* test
-check_cc <<EOF || fast_int=no
-#include <inttypes.h>
-int main(int argc, char ** argv){
-        volatile uint_fast64_t i=0x01234567;
-        return 0;
-}
-EOF
-
-# ---
 # check availability of some header files
 
 memalign=no
@@ -1699,8 +1681,6 @@
     echo "build suffix     $BUILDSUF"
 fi
 echo "big-endian       $bigendian"
-echo "inttypes.h       $inttypes"
-echo "int_fastxx_t     $fast_int"
 if test $arch = "x86_32" -o $arch = "x86_64"; then
     echo "MMX enabled      $mmx"
     echo "CMOV enabled     $cmov"

Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	(original)
+++ trunk/libavutil/common.h	Tue Nov 14 21:00:55 2006
@@ -84,18 +84,7 @@
 #endif
 #endif
 
-#ifdef HAVE_INTTYPES
 #   include <inttypes.h>
-#else
-    typedef signed char  int8_t;
-    typedef signed short int16_t;
-    typedef signed int   int32_t;
-    typedef unsigned char  uint8_t;
-    typedef unsigned short uint16_t;
-    typedef unsigned int   uint32_t;
-    typedef signed long long   int64_t;
-    typedef unsigned long long uint64_t;
-#endif /* HAVE_INTTYPES */
 
 #ifndef PRId64
 #define PRId64 "lld"
@@ -157,16 +146,6 @@
 #define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)
 #endif
 
-#ifndef HAVE_FAST_INT
-typedef signed char int_fast8_t;
-typedef signed int  int_fast16_t;
-typedef signed int  int_fast32_t;
-typedef unsigned char uint_fast8_t;
-typedef unsigned int  uint_fast16_t;
-typedef unsigned int  uint_fast32_t;
-typedef uint64_t      uint_fast64_t;
-#endif
-
 #ifndef INT_BIT
 #    if INT_MAX != 2147483647
 #        define INT_BIT 64