about summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-22 18:02:38 +0000
committerRoland McGrath <roland@gnu.org>1996-05-22 18:02:38 +0000
commitdc9972317e6fe44e503fbfe83446272743c76fb3 (patch)
tree08eb85f894d1f06cf0e8a5c151f12695f8640e06 /posix
parentb8fe19fa809ac786b7d3dbb464cb1b3f887dc69d (diff)
downloadglibc-dc9972317e6fe44e503fbfe83446272743c76fb3.tar.gz
glibc-dc9972317e6fe44e503fbfe83446272743c76fb3.tar.xz
glibc-dc9972317e6fe44e503fbfe83446272743c76fb3.zip
Regenerated: autoconf configure.in cvs/libc-960522
Diffstat (limited to 'posix')
-rw-r--r--posix/regex.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/posix/regex.c b/posix/regex.c
index 65f9599b8d..8b66cd6c5a 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -3,7 +3,7 @@
    (Implements POSIX draft P10003.2/D11.2, except for
    internationalization features.)
 
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of the GNU C Library.  Its master source is NOT part of
 the C library, however.  The master source lives in /gd/gnu/lib.
@@ -5183,7 +5183,7 @@ re_compile_pattern (pattern, length, bufp)
 /* Entry points compatible with 4.2 BSD regex library.  We don't define
    them unless specifically requested.  */
 
-#ifdef _REGEX_RE_COMP
+#if defined (_REGEX_RE_COMP) || defined (_LIBC)
 
 /* BSD has one and only one pattern buffer.  */
 static struct re_pattern_buffer re_comp_buf;
@@ -5237,6 +5237,15 @@ re_exec (s)
   return
     0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
 }
+
+#ifdef _LIBC
+/* Make these definitions weak in libc, so POSIX programs can redefine
+   these names if they don't use our functions, and still use
+   regcomp/regexec below without link errors.  */
+weak_symbol (re_comp)
+weak_symbol (re_exec)
+#endif
+
 #endif /* _REGEX_RE_COMP */
 
 /* POSIX.2 functions.  Don't define these for Emacs.  */