mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-10-23  Jim Meyering  <meyering@ascend.com>

	Allow this code to be used outside of glibc.
	* sysdeps/generic/memrchr.c: Undef __memrchr, too.
	[!weak_alias]: Define __memrchr to memrchr.
	Guard weak_alias use with `#ifdef weak_alias'.
This commit is contained in:
Ulrich Drepper 2000-10-23 23:19:40 +00:00
parent 9807e5408b
commit 298ea0ffa5
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2000-10-23 Jim Meyering <meyering@ascend.com>
Allow this code to be used outside of glibc.
* sysdeps/generic/memrchr.c: Undef __memrchr, too.
[!weak_alias]: Define __memrchr to memrchr.
Guard weak_alias use with `#ifdef weak_alias'.
2000-10-23 Ulrich Drepper <drepper@redhat.com> 2000-10-23 Ulrich Drepper <drepper@redhat.com>
* elf/unload.c: Generate more debugging output. * elf/unload.c: Generate more debugging output.

14
sysdeps/generic/memrchr.c
View File

@ -24,24 +24,24 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> # include <config.h>
#endif #endif
#undef __ptr_t #undef __ptr_t
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) #if defined __cplusplus || (defined __STDC__ && __STDC__)
# define __ptr_t void * # define __ptr_t void *
#else /* Not C++ or ANSI C. */ #else /* Not C++ or ANSI C. */
# define __ptr_t char * # define __ptr_t char *
#endif /* C++ or ANSI C. */ #endif /* C++ or ANSI C. */
#if defined (_LIBC) #if defined _LIBC
# include <string.h> # include <string.h>
# include <memcopy.h> # include <memcopy.h>
#else #else
# define reg_char char # define reg_char char
#endif #endif
#if defined (HAVE_LIMITS_H) || defined (_LIBC) #if defined HAVE_LIMITS_H || defined _LIBC
# include <limits.h> # include <limits.h>
#endif #endif
@ -53,8 +53,12 @@
#include <sys/types.h> #include <sys/types.h>
#undef __memrchr
#undef memrchr #undef memrchr
#ifndef weak_alias
# define __memrchr memrchr
#endif
/* Search no more than N bytes of S for C. */ /* Search no more than N bytes of S for C. */
__ptr_t __ptr_t
@ -200,4 +204,6 @@ __memrchr (s, c_in, n)
return 0; return 0;
} }
#ifdef weak_alias
weak_alias (__memrchr, memrchr) weak_alias (__memrchr, memrchr)
#endif