diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-06-29 12:44:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-06-29 12:44:22 +0000 |
| commit | fdacb17d4819c7112a147195c5ce3c82147f4b46 (patch) | |
| tree | d1c400488d3bc8dfe707645a0fc38916e223614c /argp/argp.h | |
| parent | ba488034eabd1affd6b4b3e8838abde0f4d0504e (diff) | |
| download | glibc-fdacb17d4819c7112a147195c5ce3c82147f4b46.zip glibc-fdacb17d4819c7112a147195c5ce3c82147f4b46.tar.gz glibc-fdacb17d4819c7112a147195c5ce3c82147f4b46.tar.bz2 | |
Update.
1998-06-29 12:27 Ulrich Drepper <drepper@cygnus.com>
* argp/argp.h: Use __PMT instead of __P for function pointer.
* iconv/gconv.h: Likewise.
* io/fts.h: Likewise.
* io/ftw.h: Likewise.
* libio/libio.h: Likewise.
* malloc/mcheck.h: Likewise.
* misc/search.h: Likewise.
* posix/glob.h: Likewise.
* resolv/resolv.h: Likewise.
* signal/signal.h: Likewise.
* stdlib/stdlib.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/siginfo.h: Likewise.
1998-06-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makeconfig (CPPFLAGS): Use $($(subdir)-CPPFLAGS) only once.
1998-06-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/wordexp.c (parse_param): Fix memory leak.
1998-06-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export _IO_ftrylockfile.
1998-06-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/aio_sigqueue.c: Use get[pu]id instead of
__get[pu]id.
1998-06-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-misc.c (_dl_debug_message): Don't cache the pid.
* elf/dl-runtime.c (_dl_object_relocation_scope): Avoid adding the
same search list twice.
1998-06-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* login/programs/utmpd.c (handle_requests): Set and use maximal fd
used to optimize loop/select.
1998-06-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/init-first.c: Don't define __libc_pid.
* sysdeps/unix/sysv/linux/init-first.c: Likewise.
* sysdeps/mach/hurd/i386/init-first.c: Likewise.
* sysdeps/mach/hurd/mips/init-first.c: Likewise.
* sysdeps/arm/init-first.c: Likewise.
* posix/getopt_init.c: Don't use __libc_pid.
* sysdeps/unix/sysv/linux/aio_sigqueue.c: Likewise.
* sysdeps/unix/sysv/linux/sigqueue.c: Likewise.
* libc.map: Remove __libc_uid and __libc_pid.
Diffstat (limited to 'argp/argp.h')
| -rw-r--r-- | argp/argp.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/argp/argp.h b/argp/argp.h index b305807..780c45f 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -39,9 +39,15 @@ typedef int error_t; #ifndef __P # if (defined __STDC__ && __STDC__) || defined __cplusplus -# define __P(args) args +# if defined __GNUC__ && defined __cplusplus && __GNUC_MINOR__ >= 8 +# define __P(args) args throw () +# else +# define __P(args) args +# endif +# define __PMT(args) args # else # define __P(args) () +# define __PMT(args) () # endif #endif @@ -124,7 +130,8 @@ struct argp_state; /* " */ struct argp_child; /* " */ /* The type of a pointer to an argp parsing function. */ -typedef error_t (*argp_parser_t)(int key, char *arg, struct argp_state *state); +typedef error_t (*argp_parser_t) __PMT ((int key, char *arg, + struct argp_state *state)); /* What to return for unrecognized keys. For special ARGP_KEY_ keys, such returns will simply be ignored. For user keys, this error will be turned @@ -237,7 +244,8 @@ struct argp has been done, so if any of the replacement text also needs translation, that should be done by the filter function. INPUT is either the input supplied to argp_parse, or NULL, if argp_help was called directly. */ - char *(*help_filter)(int __key, __const char *__text, void *__input); + char *(*help_filter) __PMT ((int __key, __const char *__text, + void *__input)); /* If non-zero the strings used in the argp library are translated using the domain described by this string. Otherwise the currently installed @@ -400,8 +408,8 @@ extern __const char *argp_program_version; calls this function with a stream to print the version to and a pointer to the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is used). This variable takes precedent over ARGP_PROGRAM_VERSION. */ -extern void (*argp_program_version_hook) __P ((FILE *__stream, - struct argp_state *__state)); +extern void (*argp_program_version_hook) __PMT ((FILE *__stream, + struct argp_state *__state)); /* If defined or set by the user program, it should point to string that is the bug-reporting address for the program. It will be printed by |