From 576a85f7c909353657acf12ca90f5a8bb2978fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Tue, 14 Nov 2006 20:00:55 +0000
Subject: [PATCH] remove workaround for missing inttypes.h
Originally committed as revision 7068 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 20 --------------------
libavutil/common.h | 21 ---------------------
2 files changed, 41 deletions(-)
diff --git a/configure b/configure
index b69834c2229..234f31bb4d4 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/libavutil/common.h b/libavutil/common.h
index 4b6ad25840e..0dbebfb8d2b 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -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
--
GitLab