Commit 576a85f7 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

remove workaround for missing inttypes.h

Originally committed as revision 7068 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b3625676
......@@ -408,12 +408,10 @@ HAVE_LIST='
dcbzl
dlfcn
dlopen
fast_int
freetype2
gprof
imlib2
inet_aton
inttypes
localtime_r
lrintf
malloc_h
......@@ -560,8 +558,6 @@ dostrip="yes"
installstrip="-s"
extralibs="-lm"
bigendian="no"
inttypes="yes"
fast_int="yes"
vhook="default"
avisynth="no"
dlfcn="no"
......@@ -1386,20 +1382,6 @@ else
fi
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
......@@ -1699,8 +1681,6 @@ if test "$BUILDSUF" != ""; then
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"
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment