about summary refs log tree commit diff
path: root/string/memchr.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-01-30 21:20:32 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-01-30 21:20:32 +0000
commitc8a89e7dd5cab24242cc9050387bd5bb902da11a (patch)
tree7aeca9797fb026f8df75c8285e3a1bfed6180da7 /string/memchr.c
parent3b1004624e54cc2fefd034ff80d5dea4b6db764f (diff)
downloadglibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.tar.gz
glibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.tar.xz
glibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.zip
Remove miscellaneous __STDC__ conditionals.
Diffstat (limited to 'string/memchr.c')
-rw-r--r--string/memchr.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/string/memchr.c b/string/memchr.c
index f3098c775a..28de95741d 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>