diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-08-22 21:00:52 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-08-22 21:00:52 +0300 |
| commit | 989bb3e5bdecbe8a8eae8705140746c65d998d15 (patch) | |
| tree | 6d04eb1a8ab05b588dc84a7c731dcb058d236a96 /support/regex.c | |
| parent | 4b72a1631970aff30d8806fc988ea22101ef340e (diff) | |
| parent | a495689c8c3e2aeef367409c4e2beddcda042312 (diff) | |
| download | egawk-989bb3e5bdecbe8a8eae8705140746c65d998d15.tar.gz egawk-989bb3e5bdecbe8a8eae8705140746c65d998d15.tar.bz2 egawk-989bb3e5bdecbe8a8eae8705140746c65d998d15.zip | |
Merge branch 'gawk-4.2-stable'
Diffstat (limited to 'support/regex.c')
| -rw-r--r-- | support/regex.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/support/regex.c b/support/regex.c index dc8caf69..d6591e86 100644 --- a/support/regex.c +++ b/support/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -15,14 +15,22 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ + <https://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -#include "config.h" +#ifndef _LIBC +# include <config.h> + +# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ +# pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" +# endif +# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ +# pragma GCC diagnostic ignored "-Wold-style-definition" +# pragma GCC diagnostic ignored "-Wtype-limits" +# endif #endif -/* Make sure noone compiles this code with a C++ compiler. */ -#ifdef __cplusplus +/* Make sure no one compiles this code with a C++ compiler. */ +#if defined __cplusplus && defined _LIBC # error "This is C code, use a C compiler" #endif @@ -56,15 +64,6 @@ #undefs RE_DUP_MAX and sets it to the right value. */ #include <limits.h> -/* This header defines the MIN and MAX macros. */ -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif /* HAVE_SYS_PARAM_H */ - -#ifdef GAWK -#undef alloca -#define alloca alloca_is_bad_you_should_never_use_it -#endif #include <regex.h> #include "regex_internal.h" |