diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
| commit | 0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch) | |
| tree | db61d4a90096b60be41fb33d6d87e79d1d9c3b04 /string/memchr.c | |
| parent | 27a25b6e633a3ea071e229337eaae36d0fa243fa (diff) | |
| parent | c8a89e7dd5cab24242cc9050387bd5bb902da11a (diff) | |
| download | glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.gz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'string/memchr.c')
| -rw-r--r-- | string/memchr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/string/memchr.c b/string/memchr.c index f3098c7..28de957 100644 --- a/string/memchr.c +++ b/string/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,93,96,97,99,2000,2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,93,96,97,99,2000,2003,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), with help from Dan Sahlin (dan@sics.se) and @@ -26,11 +26,7 @@ #endif #undef __ptr_t -#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) -# define __ptr_t void * -#else /* Not C++ or ANSI C. */ -# define __ptr_t char * -#endif /* C++ or ANSI C. */ +#define __ptr_t void * #if defined _LIBC # include <string.h> |