diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-01-30 21:20:32 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-01-30 21:20:32 +0000 |
| commit | c8a89e7dd5cab24242cc9050387bd5bb902da11a (patch) | |
| tree | 7aeca9797fb026f8df75c8285e3a1bfed6180da7 /string | |
| parent | 3b1004624e54cc2fefd034ff80d5dea4b6db764f (diff) | |
| download | glibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.tar.gz | |
Remove miscellaneous __STDC__ conditionals.
Diffstat (limited to 'string')
| -rw-r--r-- | string/memchr.c | 8 | ||||
| -rw-r--r-- | string/memcmp.c | 10 | ||||
| -rw-r--r-- | string/memrchr.c | 8 | ||||
| -rw-r--r-- | string/rawmemchr.c | 8 |
4 files changed, 8 insertions, 26 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> diff --git a/string/memcmp.c b/string/memcmp.c index 2f8cf344af..d2ec1c279c 100644 --- a/string/memcmp.c +++ b/string/memcmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1993,1995,1997,1998,2003,2004 +/* Copyright (C) 1991,1993,1995,1997,1998,2003,2004,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Torbjorn Granlund (tege@sics.se). @@ -23,13 +23,7 @@ #endif #undef __ptr_t -#if defined __cplusplus || (defined __STDC__ && __STDC__) -# define __ptr_t void * -#else /* Not C++ or ANSI C. */ -# undef const -# define const -# define __ptr_t char * -#endif /* C++ or ANSI C. */ +#define __ptr_t void * #if defined HAVE_STRING_H || defined _LIBC # include <string.h> diff --git a/string/memrchr.c b/string/memrchr.c index 498a4376ea..a19f8e61d7 100644 --- a/string/memrchr.c +++ b/string/memrchr.c @@ -1,5 +1,5 @@ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc. + Copyright (C) 1991, 93, 96, 97, 99, 2000, 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 @@ -29,11 +29,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> diff --git a/string/rawmemchr.c b/string/rawmemchr.c index cb00ad7e90..a7c9ec67d0 100644 --- a/string/rawmemchr.c +++ b/string/rawmemchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,93,96,97,99,2000,2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,93,96,97,99,2000,2002,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> |