qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regex.h: Avoid #elif __STDC_VERSION__ 

GCC 4.9 doesn't define __STDC_VERSION__ and issues an error:

In file included from ../include/regex.h:2:0,
                 from ../posix/re_comp.h:23,
                 from ../include/re_comp.h:1,
                 from /tmp/cih_test_7IKTRI.c:10:
../posix/regex.h:650:19: error: "__STDC_VERSION__" is not defined [-Werror=undef]
 # elif 199901L <= __STDC_VERSION__ || defined restrict
                   ^

Use "#else" instead.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Sam James <sam@gentoo.org>
This commit is contained in:
H.J. Lu 2024-12-13 07:13:00 +08:00
parent 5e17b4c983
commit c8c35f8c0f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
posix/regex.h
View File

@ -647,10 +647,12 @@ extern int re_exec (const char *);
|| 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \
|| __clang_major__ >= 3 || __clang_major__ >= 3
# define _Restrict_ __restrict # define _Restrict_ __restrict
# elif 199901L <= __STDC_VERSION__ || defined restrict
# define _Restrict_ restrict
# else # else
# define _Restrict_ # if 199901L <= __STDC_VERSION__ || defined restrict
# define _Restrict_ restrict
# else
# define _Restrict_
# endif
# endif # endif
#endif #endif
/* For the ISO C99 syntax /* For the ISO C99 syntax
@ -661,13 +663,15 @@ extern int re_exec (const char *);
#ifndef _Restrict_arr_ #ifndef _Restrict_arr_
# ifdef __restrict_arr # ifdef __restrict_arr
# define _Restrict_arr_ __restrict_arr # define _Restrict_arr_ __restrict_arr
# elif ((199901L <= __STDC_VERSION__ \ # else
# if ((199901L <= __STDC_VERSION__ \
|| 3 < __GNUC__ + (1 <= __GNUC_MINOR__) \ || 3 < __GNUC__ + (1 <= __GNUC_MINOR__) \
|| __clang_major__ >= 3) \ || __clang_major__ >= 3) \
&& !defined __cplusplus) && !defined __cplusplus)
# define _Restrict_arr_ _Restrict_ # define _Restrict_arr_ _Restrict_
# else # else
# define _Restrict_arr_ # define _Restrict_arr_
# endif
# endif # endif
#endif #endif