diff options
| author | Jim Meyering <jim@meyering.net> | 2003-09-10 08:55:48 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-09-10 08:55:48 +0000 |
| commit | 384a314210ef88c112cce48e2ade3df151f163c1 (patch) | |
| tree | 378dbcdc7ecac748094095e044b4555e19fc9220 | |
| parent | b6508927a37ac44606f01cea6b36352481920a2d (diff) | |
| download | coreutils-384a314210ef88c112cce48e2ade3df151f163c1.tar.xz | |
(__ptr_t): Remove; all uses changed to void *.
Include <string.h> unconditionally.
(__P): Remove, and remove all uses.
(memcmp_bytes, memcmp_common_alignment, memcmp_not_common_alignment):
Remove forward decls; no longer needed.
| -rw-r--r-- | lib/memcmp.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/lib/memcmp.c b/lib/memcmp.c index 5756bc0a4..1d2947e66 100644 --- a/lib/memcmp.c +++ b/lib/memcmp.c @@ -1,4 +1,6 @@ -/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2003 Free Software + Foundation, Inc. + Contributed by Torbjorn Granlund (tege@sics.se). NOTE: The canonical source of this file is maintained with the GNU C Library. @@ -23,26 +25,7 @@ # include "config.h" #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. */ - -#ifndef __P -# if defined __GNUC__ || (defined __STDC__ && __STDC__) -# define __P(args) args -# else -# define __P(args) () -# endif /* GCC. */ -#endif /* Not __P. */ - -#if defined HAVE_STRING_H || defined _LIBC -# include <string.h> -#endif +#include <string.h> #undef memcmp @@ -103,8 +86,6 @@ typedef unsigned char byte; A and B are known to be different. This is needed only on little-endian machines. */ -static int memcmp_bytes __P((op_t, op_t)); - # ifdef __GNUC__ __inline # endif @@ -127,8 +108,6 @@ memcmp_bytes (long unsigned int a, long unsigned int b) } #endif -static int memcmp_common_alignment __P((long, long, size_t)); - /* memcmp_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t' objects (not LEN bytes!). Both SRCP1 and SRCP2 should be aligned for memory operations on `op_t's. */ @@ -214,8 +193,6 @@ memcmp_common_alignment (long int srcp1, long int srcp2, size_t len) return 0; } -static int memcmp_not_common_alignment __P((long, long, size_t)); - /* memcmp_not_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t' objects (not LEN bytes!). SRCP2 should be aligned for memory operations on `op_t', but SRCP1 *should be unaligned*. */ |