MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie 2002-04-17 01:03:04 +00:00
parent 6338913390
commit 38b581ae41
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-16 David S. Miller <davem@redhat.com>
* xregex2.h (__restrict_arr): Define to __restrict on GCC
3.1 and later. Do not redefine.
2002-04-01 Phil Edwards <pme@gcc.gnu.org> 2002-04-01 Phil Edwards <pme@gcc.gnu.org>
* dyn-string.h: Also allow IN_GLIBCPP_V3 to redefine names. * dyn-string.h: Also allow IN_GLIBCPP_V3 to redefine names.

12
include/xregex2.h
View File

@ -529,10 +529,16 @@ extern int re_exec _RE_ARGS ((const char *));
# endif # endif
# endif # endif
#endif #endif
/* For now unconditionally define __restrict_arr to expand to nothing.
Ideally we would have a test for the compiler which allows defining /* GCC 3.1 and later support declaring arrays as non-overlapping
it to restrict. */ using the syntax array_name[restrict] */
#ifndef __restrict_arr
# if ! (3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__)) || defined (__GNUG__)
# define __restrict_arr # define __restrict_arr
# else
# define __restrict_arr __restrict
# endif
#endif
/* POSIX compatibility. */ /* POSIX compatibility. */
extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,