Commit 81dc56e7 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

clean up inttypes.h and int_fastxx_t types detection

Originally committed as revision 7050 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2e1913b1
......@@ -408,10 +408,12 @@ HAVE_LIST='
dcbzl
dlfcn
dlopen
fast_int
freetype2
gprof
imlib2
inet_aton
inttypes
localtime_r
lrintf
malloc_h
......@@ -559,7 +561,7 @@ installstrip="-s"
extralibs="-lm"
bigendian="no"
inttypes="yes"
emu_fast_int="no"
fast_int="yes"
vhook="default"
avisynth="no"
dlfcn="no"
......@@ -1390,7 +1392,7 @@ check_header inttypes.h || inttypes=no
# ---
# *int_fast* test
check_cc <<EOF || emu_fast_int=yes
check_cc <<EOF || fast_int=no
#include <inttypes.h>
int main(int argc, char ** argv){
volatile uint_fast64_t i=0x01234567;
......@@ -1698,7 +1700,7 @@ if test "$BUILDSUF" != ""; then
fi
echo "big-endian $bigendian"
echo "inttypes.h $inttypes"
echo "broken inttypes.h $emu_fast_int"
echo "int_fastxx_t $fast_int"
if test $arch = "x86_32" -o $arch = "x86_64"; then
echo "MMX enabled $mmx"
echo "CMOV enabled $cmov"
......@@ -1903,12 +1905,6 @@ if test "$bigendian" = "yes" ; then
echo "WORDS_BIGENDIAN=yes" >> config.mak
echo "#define WORDS_BIGENDIAN 1" >> $TMPH
fi
if test "$inttypes" != "yes" ; then
echo "#define EMULATE_INTTYPES 1" >> $TMPH
fi
if test "$emu_fast_int" = "yes" ; then
echo "#define EMULATE_FAST_INT 1" >> $TMPH
fi
if test "$mmx" = "yes" ; then
echo "TARGET_MMX=yes" >> config.mak
echo "#define HAVE_MMX 1" >> $TMPH
......
......@@ -84,7 +84,7 @@
#endif
#endif
#ifndef EMULATE_INTTYPES
#ifdef HAVE_INTTYPES
# include <inttypes.h>
#else
typedef signed char int8_t;
......@@ -95,7 +95,7 @@
typedef unsigned int uint32_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
#endif /* EMULATE_INTTYPES */
#endif /* HAVE_INTTYPES */
#ifndef PRId64
#define PRId64 "lld"
......@@ -157,7 +157,7 @@
#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)
#endif
#ifdef EMULATE_FAST_INT
#ifndef HAVE_FAST_INT
typedef signed char int_fast8_t;
typedef signed int int_fast16_t;
typedef signed int int_fast32_t;
......
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