aboutsummaryrefslogtreecommitdiffstats
path: root/lib/regex_internal.h
diff options
context:
space:
mode:
authorPaul Eggert2018-12-31 18:19:36 -0800
committerPaul Eggert2018-12-31 18:20:07 -0800
commit115498702da91dc75d05bd0dea64f98cc6157327 (patch)
tree1503ef74eb373344fd698a048b8aa57b8028a305 /lib/regex_internal.h
parentba809612c06bcabd05dcbaae79da39dcb0925992 (diff)
downloademacs-115498702da91dc75d05bd0dea64f98cc6157327.tar.gz
emacs-115498702da91dc75d05bd0dea64f98cc6157327.zip
Update from Gnulib
This incorporates mostly just copyright-year changes, plus recent minor updates from glibc for the non-Emacs regular expression code.
Diffstat (limited to 'lib/regex_internal.h')
-rw-r--r--lib/regex_internal.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 2c5ca29fef4..a3aedda8915 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -1,5 +1,5 @@
1/* Extended regular expression matching and search library. 1/* Extended regular expression matching and search library.
2 Copyright (C) 2002-2018 Free Software Foundation, Inc. 2 Copyright (C) 2002-2019 Free Software Foundation, Inc.
3 This file is part of the GNU C Library. 3 This file is part of the GNU C Library.
4 Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. 4 Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
5 5
@@ -146,10 +146,6 @@
146# define __regfree regfree 146# define __regfree regfree
147#endif /* not _LIBC */ 147#endif /* not _LIBC */
148 148
149#if !__GNUC_PREREQ (3, 1)
150# define __attribute__(arg)
151#endif
152
153#ifndef SSIZE_MAX 149#ifndef SSIZE_MAX
154# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) 150# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
155#endif 151#endif
@@ -867,14 +863,6 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
867} 863}
868#endif /* RE_ENABLE_I18N */ 864#endif /* RE_ENABLE_I18N */
869 865
870#if __GNUC_PREREQ (3,4)
871# undef __attribute_warn_unused_result__
872# define __attribute_warn_unused_result__ \
873 __attribute__ ((__warn_unused_result__))
874#else
875# define __attribute_warn_unused_result__ /* empty */
876#endif
877
878#ifndef FALLTHROUGH 866#ifndef FALLTHROUGH
879# if __GNUC__ < 7 867# if __GNUC__ < 7
880# define FALLTHROUGH ((void) 0) 868# define FALLTHROUGH ((void) 0)