aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-09-28 09:00:19 +0000
committerRoland McGrath <roland@gnu.org>1995-09-28 09:00:19 +0000
commit3ec41e0302fb7b3910edecfd30c97edba3a6e282 (patch)
tree64126b756c37dfcbca2564779896601d4fbed800 /sysdeps/generic
parentf94f8067b18803b47153fa0f8f67fe5763a1cd3b (diff)
downloadglibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.tar
glibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.tar.gz
glibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.tar.bz2
glibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.zip
* sysdeps/mach/hurd/getcwd.c (__getcwd): Renamed from getcwd.
(getcwd): Define as weak alias. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * posix/unistd.h: Declare __getcwd. * string/string.h: Declare __strcasecmp. * sysdeps/generic/strcasecmp.c (__strcasecmp): Renamed from strcasecmp. (strcasecmp): Define as weak alias. * string/string.h: Declare __stpcpy. * sysdeps/generic/stpcpy.c (__stpcpy): Renamed from stpcpy. (stpcpy): Define as weak alias.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r--sysdeps/generic/stpcpy.c9
-rw-r--r--sysdeps/generic/strcasecmp.c10
2 files changed, 9 insertions, 10 deletions
diff --git a/sysdeps/generic/stpcpy.c b/sysdeps/generic/stpcpy.c
index dd96948c40..4dda9a1400 100644
--- a/sysdeps/generic/stpcpy.c
+++ b/sysdeps/generic/stpcpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,16 +16,14 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
#include <string.h>
-
/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
char *
-DEFUN(stpcpy, (dest, src), char *dest AND CONST char *src)
+__stpcpy (char *dest, const char *src)
{
register char *d = dest;
- register CONST char *s = src;
+ register const char *s = src;
do
*d++ = *s;
@@ -33,3 +31,4 @@ DEFUN(stpcpy, (dest, src), char *dest AND CONST char *src)
return d - 1;
}
+weak_alias (__stpcpy, stpcpy)
diff --git a/sysdeps/generic/strcasecmp.c b/sysdeps/generic/strcasecmp.c
index 7ccfe5c0c5..82e1a90334 100644
--- a/sysdeps/generic/strcasecmp.c
+++ b/sysdeps/generic/strcasecmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
#include <string.h>
#include <ctype.h>
@@ -24,10 +23,10 @@ Cambridge, MA 02139, USA. */
greater than zero if S1 is lexiographically less than,
equal to or greater than S2. */
int
-DEFUN(strcasecmp, (s1, s2), CONST char *s1 AND CONST char *s2)
+__strcasecmp (const char *s1, const char *s2)
{
- register CONST unsigned char *p1 = (CONST unsigned char *) s1;
- register CONST unsigned char *p2 = (CONST unsigned char *) s2;
+ register const unsigned char *p1 = (const unsigned char *) s1;
+ register const unsigned char *p2 = (const unsigned char *) s2;
unsigned char c1, c2;
if (p1 == p2)
@@ -44,3 +43,4 @@ DEFUN(strcasecmp, (s1, s2), CONST char *s1 AND CONST char *s2)
return c1 - c2;
}
+weak_alias (__strcasecmp, strcasecmp)