aboutsummaryrefslogtreecommitdiff
path: root/posix/regex.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-15 02:40:04 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-15 02:40:04 +0000
commit409dfcea953837975cd8cb52e16197c85803930a (patch)
tree0c226d217afcbd63579d59a3cd2389fcc1a3f2aa /posix/regex.c
parent9d141cae00c957096045d08fe504b4a2be66ab75 (diff)
downloadglibc-409dfcea953837975cd8cb52e16197c85803930a.zip
glibc-409dfcea953837975cd8cb52e16197c85803930a.tar.gz
glibc-409dfcea953837975cd8cb52e16197c85803930a.tar.bz2
Update.
1998-08-14 10:08 Ulrich Drepper <drepper@cygnus.com> * manual/texinfo.tex: Update. 1998-08-07 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/backtrace.c: New file. 1998-08-14 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/fpu/setjmp.S: Correct value of R0 before calling sigjmp_save. * sysdeps/arm/elf/setjmp.S: Obsolete, deleted. 1998-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile (install-symbolic-link): Fix spelling. 1998-08-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/elf.h (SHT_HIOS): Fix value. 1998-08-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/regex.c (WIDE_CHAR_SUPPORT): Don't generate defined as part of the expansion, this is undefined by the standard.
Diffstat (limited to 'posix/regex.c')
-rw-r--r--posix/regex.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/posix/regex.c b/posix/regex.c
index 0543433..98ff8df 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -46,12 +46,11 @@
# include <sys/types.h>
#endif
-#define WIDE_CHAR_SUPPORT \
- defined _LIBC || (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC)
+#define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC)
/* For platform which support the ISO C amendement 1 functionality we
support user defined character classes. */
-#if WIDE_CHAR_SUPPORT
+#if defined _LIBC || WIDE_CHAR_SUPPORT
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
# include <wchar.h>
# include <wctype.h>
@@ -1719,7 +1718,7 @@ typedef struct
} \
}
-#if WIDE_CHAR_SUPPORT
+#if defined _LIBC || WIDE_CHAR_SUPPORT
/* The GNU C library provides support for user-defined character classes
and the functions from ISO C amendement 1. */
# ifdef CHARCLASS_NAME_MAX
@@ -2223,7 +2222,7 @@ regex_compile (pattern, size, syntax, bufp)
the leading `:' and `[' (but set bits for them). */
if (c == ':' && *p == ']')
{
-#if WIDE_CHAR_SUPPORT
+#if defined _LIBC || WIDE_CHAR_SUPPORT
boolean is_lower = STREQ (str, "lower");
boolean is_upper = STREQ (str, "upper");
wctype_t wt;