mirror of https://code.videolan.org/videolan/vlc
switch to C17
This commit is contained in:
parent
1d5d67b709
commit
b164a2f4b9
|
@ -40,7 +40,7 @@ dnl Check for tools
|
|||
dnl
|
||||
AC_PROG_CC
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
VLC_PROG_CC_C11
|
||||
VLC_PROG_CC_C17
|
||||
AH_VERBATIM([FORTIFY_SOURCE],
|
||||
[/* Enable compile-time and run-time bounds-checking, and some warnings,
|
||||
without upsetting glibc 2.15+ or toolchains predefining _FORTIFY_SOURCE */
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Copyright © 2015 Rémi Denis-Courmont
|
||||
# This file (c11.m4) is free software; unlimited permission to
|
||||
# This file (c17.m4) is free software; unlimited permission to
|
||||
# copy and/or distribute it , with or without modifications, as long
|
||||
# as this notice is preserved.
|
||||
|
||||
|
@ -9,13 +9,13 @@
|
|||
# PARTICULAR PURPOSE.
|
||||
|
||||
|
||||
AC_DEFUN([VLC_PROG_CC_C11], [
|
||||
AC_DEFUN([VLC_PROG_CC_C17], [
|
||||
AC_LANG_ASSERT(C)
|
||||
|
||||
for opt in "" -std=gnu11 -std=c11 -c11
|
||||
for opt in "" -std=gnu17 -std=c17 -c17
|
||||
do
|
||||
cachevar=AS_TR_SH([ax_cv_c_compile_c11_$opt])
|
||||
AC_CACHE_CHECK([whether $CC $opt supports C11], [$cachevar], [
|
||||
cachevar=AS_TR_SH([ax_cv_c_compile_c17_$opt])
|
||||
AC_CACHE_CHECK([whether $CC $opt supports C17], [$cachevar], [
|
||||
CFLAGS_save="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $opt"
|
||||
dnl PREPROC is not enough due to CFLAGS usage
|
||||
|
@ -23,10 +23,10 @@ AC_DEFUN([VLC_PROG_CC_C11], [
|
|||
[#ifndef __STDC_VERSION__
|
||||
# error Not a C compiler!
|
||||
#endif
|
||||
#if (__STDC_VERSION__ < 201112L)
|
||||
#if (__STDC_VERSION__ < 201710L)
|
||||
# error Too old C compiler!
|
||||
#endif
|
||||
_Static_assert(1, "Not C11!");
|
||||
_Static_assert(1, "Not C17!");
|
||||
const int varname = _Generic(1, int: 1, default: 0);
|
||||
]])], [
|
||||
eval $cachevar="yes"
|
|
@ -1,6 +1,6 @@
|
|||
project('VLC', ['c', 'cpp'],
|
||||
version: '4.0.0-dev',
|
||||
default_options: ['c_std=gnu11', 'cpp_std=c++17'],
|
||||
default_options: ['c_std=gnu17', 'cpp_std=c++17'],
|
||||
meson_version: '>=0.60.0')
|
||||
|
||||
vlc_copyright_years = '1996-2018'
|
||||
|
|
Loading…
Reference in New Issue