summaryrefslogtreecommitdiff
path: root/lib/regex_internal.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-12-31 18:19:36 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-12-31 18:20:07 -0800
commit115498702da91dc75d05bd0dea64f98cc6157327 (patch)
tree1503ef74eb373344fd698a048b8aa57b8028a305 /lib/regex_internal.h
parentba809612c06bcabd05dcbaae79da39dcb0925992 (diff)
downloademacs-115498702da91dc75d05bd0dea64f98cc6157327.tar.gz
emacs-115498702da91dc75d05bd0dea64f98cc6157327.tar.bz2
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 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2018 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -146,10 +146,6 @@
# define __regfree regfree
#endif /* not _LIBC */
-#if !__GNUC_PREREQ (3, 1)
-# define __attribute__(arg)
-#endif
-
#ifndef SSIZE_MAX
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
#endif
@@ -867,14 +863,6 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
}
#endif /* RE_ENABLE_I18N */
-#if __GNUC_PREREQ (3,4)
-# undef __attribute_warn_unused_result__
-# define __attribute_warn_unused_result__ \
- __attribute__ ((__warn_unused_result__))
-#else
-# define __attribute_warn_unused_result__ /* empty */
-#endif
-
#ifndef FALLTHROUGH
# if __GNUC__ < 7
# define FALLTHROUGH ((void) 0)