summary refs log tree commit diff
path: root/posix/regex.c
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <thomas@gnu.org>1996-07-09 05:02:06 +0000
committerThomas Bushnell, BSG <thomas@gnu.org>1996-07-09 05:02:06 +0000
commit18c75117c20d721af72a6cc1755520a7074db8cb (patch)
tree300ae7df61e30d7966e468eb0f98d41d1a73b6be /posix/regex.c
parentf8fc0dd6495308582e5a098ee4488839779d6c55 (diff)
downloadglibc-18c75117c20d721af72a6cc1755520a7074db8cb.tar.gz
glibc-18c75117c20d721af72a6cc1755520a7074db8cb.tar.xz
glibc-18c75117c20d721af72a6cc1755520a7074db8cb.zip
*** empty log message ***
Tue Jul  9 00:14:52 1996  Michael I. Bushnell p/BSG  <mib@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/ioctls.h (MDMBUF, ECHO, TOSTOP, FLUSHO,
 	PENDIN, NOFLSH): Undefine these at start if they are already
 	defined to avoid collision with termbits.h.
	* sysdeps/generic/termbits.h (ECHO, TOSTOP, NOFLSH): Likewise.
	(MDMBUF, FLUSHO, PENDIN) [__USE_BSD]: Likewise.


Mon Jul  8 13:10:50 1996  Michael I. Bushnell p/BSG  <mib@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/errnos.awk: Skip entries where the
 	error is 0.  The "placeholder" entries recently added to 
	errno.texi convert to zero since `???/' is at the front of them.
	* sysdeps/gnu/errlist.awk (errnoh): Likewise.

	* sysdeps/stub/setdomain.c (setdomainname): Declare NAME parm 
	__const to conform with unistd.h.

	* posix/regex.c (re_comp, re_exec): Use weak_function as
	keyword in function defns instead of weak_symbol (NAME) after
	the defn.

	* stdlib/stdlib.h (random): Declare return type to be int32_t.
Diffstat (limited to 'posix/regex.c')
-rw-r--r--posix/regex.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/posix/regex.c b/posix/regex.c
index 3dd03b26c3..fdfd102cdb 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -5190,7 +5190,7 @@ re_compile_pattern (pattern, length, bufp)
 /* BSD has one and only one pattern buffer.  */
 static struct re_pattern_buffer re_comp_buf;
 
-char *
+char * weak_function
 re_comp (s)
     const char *s;
 {
@@ -5231,7 +5231,7 @@ re_comp (s)
 }
 
 
-int
+int weak_function
 re_exec (s)
     const char *s;
 {
@@ -5240,14 +5240,6 @@ re_exec (s)
     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.  */