generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up inttypes.h and int_fastxx_t types detection

Browse Source 
Originally committed as revision 7050 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-11-14 04:02:58 +00:00
parent 2e1913b193
commit 81dc56e76e
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -408,10 +408,12 @@ HAVE_LIST='
dcbzl dcbzl
dlfcn dlfcn
dlopen dlopen
fast_int
freetype2 freetype2
gprof gprof
imlib2 imlib2
inet_aton inet_aton
inttypes
localtime_r localtime_r
lrintf lrintf
malloc_h malloc_h
@ -559,7 +561,7 @@ installstrip="-s"
extralibs="-lm" extralibs="-lm"
bigendian="no" bigendian="no"
inttypes="yes" inttypes="yes"
emu_fast_int="no" fast_int="yes"
vhook="default" vhook="default"
avisynth="no" avisynth="no"
dlfcn="no" dlfcn="no"
@ -1390,7 +1392,7 @@ check_header inttypes.h || inttypes=no
# --- # ---
# *int_fast* test # *int_fast* test
check_cc <<EOF || emu_fast_int=yes check_cc <<EOF || fast_int=no
#include <inttypes.h> #include <inttypes.h>
int main(int argc, char ** argv){ int main(int argc, char ** argv){
volatile uint_fast64_t i=0x01234567; volatile uint_fast64_t i=0x01234567;
@ -1698,7 +1700,7 @@ if test "$BUILDSUF" != ""; then
fi fi
echo "big-endian $bigendian" echo "big-endian $bigendian"
echo "inttypes.h $inttypes" 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 if test $arch = "x86_32" -o $arch = "x86_64"; then
echo "MMX enabled $mmx" echo "MMX enabled $mmx"
echo "CMOV enabled $cmov" echo "CMOV enabled $cmov"
@ -1903,12 +1905,6 @@ if test "$bigendian" = "yes" ; then
echo "WORDS_BIGENDIAN=yes" >> config.mak echo "WORDS_BIGENDIAN=yes" >> config.mak
echo "#define WORDS_BIGENDIAN 1" >> $TMPH echo "#define WORDS_BIGENDIAN 1" >> $TMPH
fi 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 if test "$mmx" = "yes" ; then
echo "TARGET_MMX=yes" >> config.mak echo "TARGET_MMX=yes" >> config.mak
echo "#define HAVE_MMX 1" >> $TMPH echo "#define HAVE_MMX 1" >> $TMPH

6
libavutil/common.h
View File

@ -84,7 +84,7 @@
#endif #endif
#endif #endif
#ifndef EMULATE_INTTYPES #ifdef HAVE_INTTYPES
# include <inttypes.h> # include <inttypes.h>
#else #else
typedef signed char int8_t; typedef signed char int8_t;
@ -95,7 +95,7 @@
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef signed long long int64_t; typedef signed long long int64_t;
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif /* EMULATE_INTTYPES */ #endif /* HAVE_INTTYPES */
#ifndef PRId64 #ifndef PRId64
#define PRId64 "lld" #define PRId64 "lld"
@ -157,7 +157,7 @@
#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF) #define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)
#endif #endif
#ifdef EMULATE_FAST_INT #ifndef HAVE_FAST_INT
typedef signed char int_fast8_t; typedef signed char int_fast8_t;
typedef signed int int_fast16_t; typedef signed int int_fast16_t;
typedef signed int int_fast32_t; typedef signed int int_fast32_t;