diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-27 11:45:21 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-27 11:45:47 -0800 |
| commit | ee7514b91beb254a7dc62f618046d34036555cea (patch) | |
| tree | 7299efc4b14731bb30d013bb9594b2e7834b1d8d /lib/regex_internal.h | |
| parent | a8576aba8fa45549985566bc8be4921dce508dd9 (diff) | |
| download | emacs-ee7514b91beb254a7dc62f618046d34036555cea.tar.gz | |
Update from Gnulib
* build-aux/config.guess, lib/regcomp.c, lib/regex.c:
* lib/regex_internal.h, lib/regexec.c: Copy from Gnulib.
Diffstat (limited to 'lib/regex_internal.h')
| -rw-r--r-- | lib/regex_internal.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/regex_internal.h b/lib/regex_internal.h index b0e49cd828f..2c5ca29fef4 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -144,10 +144,9 @@ # define __mbrtowc mbrtowc # define __wcrtomb wcrtomb # define __regfree regfree -# define attribute_hidden #endif /* not _LIBC */ -#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1) +#if !__GNUC_PREREQ (3, 1) # define __attribute__(arg) #endif @@ -868,15 +867,6 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx) } #endif /* RE_ENABLE_I18N */ -#ifndef __GNUC_PREREQ -# if defined __GNUC__ && defined __GNUC_MINOR__ -# define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -# else -# define __GNUC_PREREQ(maj, min) 0 -# endif -#endif - #if __GNUC_PREREQ (3,4) # undef __attribute_warn_unused_result__ # define __attribute_warn_unused_result__ \ |