aboutsummaryrefslogtreecommitdiffstats
path: root/lib/regex_internal.h
diff options
context:
space:
mode:
authorPaul Eggert2018-12-27 11:45:21 -0800
committerPaul Eggert2018-12-27 11:45:47 -0800
commitee7514b91beb254a7dc62f618046d34036555cea (patch)
tree7299efc4b14731bb30d013bb9594b2e7834b1d8d /lib/regex_internal.h
parenta8576aba8fa45549985566bc8be4921dce508dd9 (diff)
downloademacs-ee7514b91beb254a7dc62f618046d34036555cea.tar.gz
emacs-ee7514b91beb254a7dc62f618046d34036555cea.zip
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.h12
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 @@
144# define __mbrtowc mbrtowc 144# define __mbrtowc mbrtowc
145# define __wcrtomb wcrtomb 145# define __wcrtomb wcrtomb
146# define __regfree regfree 146# define __regfree regfree
147# define attribute_hidden
148#endif /* not _LIBC */ 147#endif /* not _LIBC */
149 148
150#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1) 149#if !__GNUC_PREREQ (3, 1)
151# define __attribute__(arg) 150# define __attribute__(arg)
152#endif 151#endif
153 152
@@ -868,15 +867,6 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
868} 867}
869#endif /* RE_ENABLE_I18N */ 868#endif /* RE_ENABLE_I18N */
870 869
871#ifndef __GNUC_PREREQ
872# if defined __GNUC__ && defined __GNUC_MINOR__
873# define __GNUC_PREREQ(maj, min) \
874 ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
875# else
876# define __GNUC_PREREQ(maj, min) 0
877# endif
878#endif
879
880#if __GNUC_PREREQ (3,4) 870#if __GNUC_PREREQ (3,4)
881# undef __attribute_warn_unused_result__ 871# undef __attribute_warn_unused_result__
882# define __attribute_warn_unused_result__ \ 872# define __attribute_warn_unused_result__ \