From 3ec41e0302fb7b3910edecfd30c97edba3a6e282 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 28 Sep 1995 09:00:19 +0000 Subject: * 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. --- sysdeps/generic/stpcpy.c | 9 ++++----- sysdeps/generic/strcasecmp.c | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/stpcpy.c b/sysdeps/generic/stpcpy.c index dd96948..4dda9a1 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 #include - /* 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 7ccfe5c..82e1a90 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 #include #include @@ -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) -- cgit v1.1