--- configure | 23 +++++------------------ libavcodec/binkdsp.h | 2 -- libavcodec/dnxhdenc.h | 2 -- libavcodec/h263.h | 2 -- libavcodec/idctdsp.h | 2 -- libavcodec/pixblockdsp.h | 2 -- libavutil/float_dsp.h | 2 -- 7 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/configure b/configure index 21f24e8e0f..e776e3b432 100755 --- a/configure +++ b/configure @@ -4134,12 +4134,11 @@ extern_prefix=${sym%%ff_extern*} ! disabled inline_asm && check_inline_asm inline_asm '"" ::' -_restrict= -for restrict_keyword in restrict __restrict__ __restrict; do - check_cc <<EOF && _restrict=$restrict_keyword && break -void foo(char * $restrict_keyword p); -EOF -done +if ! check_code cc "" "char * restrict p"; then + for restrict_keyword in __restrict __restrict__; do + check_code cc "" "char * $restrict_keyword p" && add_cppflags -Drestrict=$restrict_keyword && break + done +fi check_cc <<EOF && enable pragma_deprecated void foo(void) { _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") } @@ -4953,17 +4952,6 @@ elif enabled_any msvc icl; then fi # msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards actually has log2. check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2 - # The CRT headers contain __declspec(restrict) in a few places, but if redefining - # restrict, this might break. MSVC 2010 and 2012 fail with __declspec(__restrict) - # (as it ends up if the restrict redefine is done before including stdlib.h), while - # MSVC 2013 and newer can handle it fine. - # If this declspec fails, force including stdlib.h before the restrict redefinition - # happens in config.h. - if [ $_restrict != restrict ]; then - check_cc <<EOF || add_cflags -FIstdlib.h -__declspec($_restrict) void* foo(int); -EOF - fi fi for pfx in "" host_; do @@ -5318,7 +5306,6 @@ cat > $TMPH <<EOF #define LIBAV_LICENSE "$(c_escape $license)" #define AVCONV_DATADIR "$(eval c_escape $datadir)" #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})" -#define restrict $_restrict #define EXTERN_PREFIX "${extern_prefix}" #define EXTERN_ASM ${extern_prefix} #define SLIBSUF "$SLIBSUF" diff --git a/libavcodec/binkdsp.h b/libavcodec/binkdsp.h index 9524fe27e8..17dce2fb0f 100644 --- a/libavcodec/binkdsp.h +++ b/libavcodec/binkdsp.h @@ -29,8 +29,6 @@ #include <stdint.h> -#include "config.h" - typedef struct BinkDSPContext { void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index c6755f7b59..823d564ca8 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -26,8 +26,6 @@ #include <stdint.h> -#include "config.h" - #include "mpegvideo.h" #include "dnxhddata.h" diff --git a/libavcodec/h263.h b/libavcodec/h263.h index ce697da20e..02dc7c8ee9 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -22,8 +22,6 @@ #include <stdint.h> -#include "config.h" - #include "libavutil/rational.h" #include "get_bits.h" diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h index c6b7aeda5f..b2e905f86e 100644 --- a/libavcodec/idctdsp.h +++ b/libavcodec/idctdsp.h @@ -21,8 +21,6 @@ #include <stdint.h> -#include "config.h" - #include "avcodec.h" /** diff --git a/libavcodec/pixblockdsp.h b/libavcodec/pixblockdsp.h index c7587cba16..8e19928d77 100644 --- a/libavcodec/pixblockdsp.h +++ b/libavcodec/pixblockdsp.h @@ -21,8 +21,6 @@ #include <stdint.h> -#include "config.h" - #include "avcodec.h" typedef struct PixblockDSPContext { diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h index 3142df4fd3..c95dce6fd6 100644 --- a/libavutil/float_dsp.h +++ b/libavutil/float_dsp.h @@ -19,8 +19,6 @@ #ifndef AVUTIL_FLOAT_DSP_H #define AVUTIL_FLOAT_DSP_H -#include "config.h" - typedef struct AVFloatDSPContext { /** * Calculate the product of two vectors of floats and store the result in -- 2.11.0 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel