diff options
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/chflags.c | 4 | ||||
-rw-r--r-- | sysdeps/generic/fchflags.c | 4 | ||||
-rw-r--r-- | sysdeps/generic/glob.c | 21 | ||||
-rw-r--r-- | sysdeps/generic/memcmp.c | 14 | ||||
-rw-r--r-- | sysdeps/generic/memcopy.h | 10 | ||||
-rw-r--r-- | sysdeps/generic/morecore.c | 4 | ||||
-rw-r--r-- | sysdeps/generic/printf_fphex.c | 4 | ||||
-rw-r--r-- | sysdeps/generic/sstk.c | 4 |
8 files changed, 28 insertions, 37 deletions
diff --git a/sysdeps/generic/chflags.c b/sysdeps/generic/chflags.c index e791e1caeb..b678121265 100644 --- a/sysdeps/generic/chflags.c +++ b/sysdeps/generic/chflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ /* Change the flags of FILE to FLAGS. */ -int chflags __P ((const char *file, int flags)); +int chflags (const char *file, int flags) __THROW; int chflags (file, flags) diff --git a/sysdeps/generic/fchflags.c b/sysdeps/generic/fchflags.c index 77359fe155..f191194c12 100644 --- a/sysdeps/generic/fchflags.c +++ b/sysdeps/generic/fchflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ /* Change the flags of the file FD refers to to FLAGS. */ -int fchflags __P ((int fd, int flags)); +int fchflags (int fd, int flags) __THROW; int fchflags (fd, flags) diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index 53e17330f4..a6d6ada8bd 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -334,23 +334,22 @@ extern char *alloca (); #include <glob.h> #ifdef HAVE_GETLOGIN_R -extern int getlogin_r __PMT ((char *, size_t)); +extern int getlogin_r (char *, size_t); #else -extern char *getlogin __PMT ((void)); +extern char *getlogin (void); #endif -static const char *next_brace_sub __P ((const char *begin, int flags)); +static const char *next_brace_sub (const char *begin, int flags) __THROW; #endif /* GLOB_ONLY_P */ -static int glob_in_dir __PMT ((const char *pattern, const char *directory, - int flags, - int (*errfunc) (const char *, int), - glob_t *pglob)); +static int glob_in_dir (const char *pattern, const char *directory, + int flags, int (*errfunc) (const char *, int), + glob_t *pglob); #if !defined _LIBC || !defined GLOB_ONLY_P -static int prefix_array __P ((const char *prefix, char **array, size_t n)); -static int collated_compare __P ((const __ptr_t, const __ptr_t)); +static int prefix_array (const char *prefix, char **array, size_t n) __THROW; +static int collated_compare (const __ptr_t, const __ptr_t) __THROW; /* Find the end of the sub-pattern in a brace expression. */ @@ -396,7 +395,7 @@ GLOB_ATTRIBUTE glob (pattern, flags, errfunc, pglob) const char *pattern; int flags; - int (*errfunc) __PMT ((const char *, int)); + int (*errfunc) (const char *, int); glob_t *pglob; { const char *filename; @@ -1283,7 +1282,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob) const char *pattern; const char *directory; int flags; - int (*errfunc) __PMT ((const char *, int)); + int (*errfunc) (const char *, int); glob_t *pglob; { __ptr_t stream = NULL; diff --git a/sysdeps/generic/memcmp.c b/sysdeps/generic/memcmp.c index 212098a906..2f8cf344af 100644 --- a/sysdeps/generic/memcmp.c +++ b/sysdeps/generic/memcmp.c @@ -31,14 +31,6 @@ # 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 @@ -102,7 +94,7 @@ 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)); +static int memcmp_bytes (op_t, op_t) __THROW; # ifdef __GNUC__ __inline @@ -127,7 +119,7 @@ memcmp_bytes (a, b) } #endif -static int memcmp_common_alignment __P((long, long, size_t)); +static int memcmp_common_alignment (long, long, size_t) __THROW; /* 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 @@ -214,7 +206,7 @@ memcmp_common_alignment (srcp1, srcp2, len) return 0; } -static int memcmp_not_common_alignment __P((long, long, size_t)); +static int memcmp_not_common_alignment (long, long, size_t) __THROW; /* memcmp_not_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t' objects (not LEN bytes!). SRCP2 should be aligned for memory diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h index f6d21cfd87..bc5c18d4a5 100644 --- a/sysdeps/generic/memcopy.h +++ b/sysdeps/generic/memcopy.h @@ -1,5 +1,5 @@ /* memcopy.h -- definitions for memory copy functions. Generic C version. - Copyright (C) 1991, 1992, 1993, 1997 Free Software Foundation, Inc. + Copyright (C) 1991, 1992, 1993, 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Torbjorn Granlund (tege@sics.se). @@ -111,8 +111,8 @@ typedef unsigned char byte; the assumption that DST_BP is aligned on an OPSIZ multiple. If not all bytes could be easily copied, store remaining number of bytes in NBYTES_LEFT, otherwise store 0. */ -extern void _wordcopy_fwd_aligned __P ((long int, long int, size_t)); -extern void _wordcopy_fwd_dest_aligned __P ((long int, long int, size_t)); +extern void _wordcopy_fwd_aligned (long int, long int, size_t) __THROW; +extern void _wordcopy_fwd_dest_aligned (long int, long int, size_t) __THROW; #define WORD_COPY_FWD(dst_bp, src_bp, nbytes_left, nbytes) \ do \ { \ @@ -131,8 +131,8 @@ extern void _wordcopy_fwd_dest_aligned __P ((long int, long int, size_t)); DST_END_PTR is aligned on an OPSIZ multiple. If not all bytes could be easily copied, store remaining number of bytes in NBYTES_REMAINING, otherwise store 0. */ -extern void _wordcopy_bwd_aligned __P ((long int, long int, size_t)); -extern void _wordcopy_bwd_dest_aligned __P ((long int, long int, size_t)); +extern void _wordcopy_bwd_aligned (long int, long int, size_t) __THROW; +extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t) __THROW; #define WORD_COPY_BWD(dst_ep, src_ep, nbytes_left, nbytes) \ do \ { \ diff --git a/sysdeps/generic/morecore.c b/sysdeps/generic/morecore.c index 11a12e6d2b..0a66ef5a85 100644 --- a/sysdeps/generic/morecore.c +++ b/sysdeps/generic/morecore.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 97, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,94,95,97,2002,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ #include <stddef.h> #include <stdlib.h> -extern __malloc_ptr_t __sbrk __P ((ptrdiff_t increment)); +extern __malloc_ptr_t __sbrk (ptrdiff_t increment) __THROW; libc_hidden_proto (__sbrk) #endif diff --git a/sysdeps/generic/printf_fphex.c b/sysdeps/generic/printf_fphex.c index 5b18c5ebb0..fd790d5bf3 100644 --- a/sysdeps/generic/printf_fphex.c +++ b/sysdeps/generic/printf_fphex.c @@ -1,5 +1,5 @@ /* Print floating point number in hexadecimal notation according to ISO C99. - Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc. + Copyright (C) 1997-2002,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -49,7 +49,7 @@ #else /* ! USE_IN_LIBIO */ # define PUT(f, s, n) fwrite (s, 1, n, f) # define PAD(f, c, n) __printf_pad (f, c, n) -ssize_t __printf_pad __P ((FILE *, char pad, int n)); /* In vfprintf.c. */ +ssize_t __printf_pad (FILE *, char pad, int n) __THROW; /* In vfprintf.c. */ #endif /* USE_IN_LIBIO */ /* Macros for doing the actual output. */ diff --git a/sysdeps/generic/sstk.c b/sysdeps/generic/sstk.c index ce5cc72d91..6cba9b7fba 100644 --- a/sysdeps/generic/sstk.c +++ b/sysdeps/generic/sstk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ /* Increase the size of the stack by INCREMENT, and return the address of the bottom of the stack. */ -void *sstk __P ((int increment)); +void *sstk (int increment) __THROW; void * sstk (increment) |