har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Simplify restrict keyword handling

Browse Source 
Skip a variable indirection and only redefine restrict if necessary.
This commit is contained in:
Diego Biurrun 2017-11-10 15:40:30 +01:00
parent 4cf84e254a
commit 38434a9ff5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -4144,9 +4144,8 @@ extern_prefix=${sym%%ff_extern*}
! disabled inline_asm && check_inline_asm inline_asm '"" ::' ! disabled inline_asm && check_inline_asm inline_asm '"" ::'
_restrict= for restrict_keyword in restrict __restrict__ __restrict ""; do
for restrict_keyword in restrict __restrict__ __restrict; do check_cc <<EOF && break
check_cc <<EOF && _restrict=$restrict_keyword && break
void foo(char * $restrict_keyword p); void foo(char * $restrict_keyword p);
EOF EOF
done done
@ -4974,9 +4973,9 @@ elif enabled_any msvc icl; then
# MSVC 2013 and newer can handle it fine. # MSVC 2013 and newer can handle it fine.
# If this declspec fails, force including stdlib.h before the restrict redefinition # If this declspec fails, force including stdlib.h before the restrict redefinition
# happens in config.h. # happens in config.h.
if [ $_restrict != restrict ]; then if [ $restrict_keyword != restrict ]; then
check_cc <<EOF || add_cflags -FIstdlib.h check_cc <<EOF || add_cflags -FIstdlib.h
__declspec($_restrict) void* foo(int); __declspec($restrict_keyword) void *foo(int);
EOF EOF
fi fi
fi fi
@ -5323,12 +5322,14 @@ cat > $TMPH <<EOF
#define LIBAV_LICENSE "$(c_escape $license)" #define LIBAV_LICENSE "$(c_escape $license)"
#define AVCONV_DATADIR "$(eval c_escape $datadir)" #define AVCONV_DATADIR "$(eval c_escape $datadir)"
#define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})" #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
#define restrict $_restrict
#define EXTERN_PREFIX "${extern_prefix}" #define EXTERN_PREFIX "${extern_prefix}"
#define EXTERN_ASM ${extern_prefix} #define EXTERN_ASM ${extern_prefix}
#define SLIBSUF "$SLIBSUF" #define SLIBSUF "$SLIBSUF"
EOF EOF
test $restrict_keyword != restrict &&
echo "#define restrict $restrict_keyword" >> $TMPH
test -n "$malloc_prefix" && test -n "$malloc_prefix" &&
echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH