qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[build] Fix some config errors found by gcc 14

Browse source 
Or more realistically, attempting to use gcc 14 (it ICEs, so can't be
used yet).
This commit is contained in:
Bill Currie 2024-05-26 15:06:03 +09:00
parent 38b1d2d238
commit 2b70eaa85e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.d/compiling.m4
View file

@ -56,7 +56,7 @@ if test "x$GCC" = xyes; then
shift
args="$*"
AC_MSG_CHECKING(for gcc version)
CCVER="gcc `$CC --version | grep '[[0-9]]\.[[0-9]]' | sed -e 's/.*(GCC)//' -e 's/[[^0-9]]*\([[0-9.]]*\).*/\1/'`"
CCVER="gcc `$CC --version | grep '[[0-9]]\.[[0-9]]' | sed -e 's/.*([[^)]]*)//' -e 's/[[^0-9]]*\([[0-9.]]*\).*/\1/'`"
set $CCVER
save_IFS="$IFS"
IFS="."
@ -341,7 +341,7 @@ if test "x$leave_cflags_alone" != xyes; then
[[bool flag = true;]],
[[return flag ? 1 : 0]])],
[],
[QF_CC_OPTION_TEST(-std=gnu23,[],QF_CC_OPTION(-std=gnu2x))]
[QF_CC_OPTION_TEST(-std=gnu23,QF_CC_OPTION(-std=gnu23),QF_CC_OPTION(-std=gnu2x))]
)
fi
AC_MSG_CHECKING([for c23])

6
config.d/header_files.m4
View file

@ -37,16 +37,16 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "fnmatch.h"]], [[int (*foo)() = fn
])
AC_MSG_CHECKING(for strnlen in string.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[int (*foo)() = strnlen;]])],[AC_DEFINE(HAVE_STRNLEN_PROTO, 1, Define this if strnlen is prototyped in string.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[size_t (*foo)(const char *, size_t) = strnlen;]])],[AC_DEFINE(HAVE_STRNLEN_PROTO, 1, Define this if strnlen is prototyped in string.h)
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
])
AC_MSG_CHECKING(for strndup in string.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[int (*foo)() = strndup;]])],[AC_DEFINE(HAVE_STRNDUP_PROTO, 1, Define this if strndup is prototyped in string.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[char *(*foo)(const char *, size_t) = strndup;]])],[AC_DEFINE(HAVE_STRNDUP_PROTO, 1, Define this if strndup is prototyped in string.h)
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
])
AC_MSG_CHECKING(for strcasestr in string.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[int (*foo)() = strcasestr;]])],[AC_DEFINE(HAVE_STRCASESTR_PROTO, 1, Define this if strcasestr is prototyped in string.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[char *(*foo)(const char *, const char *) = strcasestr;]])],[AC_DEFINE(HAVE_STRCASESTR_PROTO, 1, Define this if strcasestr is prototyped in string.h)
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
])

2
include/compat.h
View file

@ -96,7 +96,7 @@ size_t strnlen (const char *str, size_t len);
#endif
#ifdef HAVE_STRNDUP
# ifndef HAVE_STRNDUP_PROTO
size_t strndup (const char *str, size_t len);
char *strndup (const char *str, size_t len);
# endif
#else
# define strndup Q_strndup