summaryrefslogtreecommitdiff
path: root/posix/getopt.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-04-22 03:33:47 +0000
committerUlrich Drepper <drepper@redhat.com>2001-04-22 03:33:47 +0000
commit463468350f1735034d9f1b4a3d4a50a5a794620e (patch)
tree7b61cf3d69e5ab2394131afbe11175db0b3ab566 /posix/getopt.h
parent5a74e68a52e0ef995733b27044dffeb8c7ce3dcd (diff)
Update.
2001-04-21 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * sysdeps/unix/sysv/linux/powerpc/mmap64.c: Correct check for invalid offset. 2001-04-21 Ulrich Drepper <drepper@redhat.com> * posix/getopt.h: Treat __cplusplus like __STDC__. 2001-04-20 John S. Marvin <jsm@fc.hp.com> * sysdeps/unix/sysv/linux/hppa/clone.S: Fix clone system call entry point stub. 2001-04-20 Richard Hirst <rhirst@linuxcare.com> * elf/elf.h: Corrected R_PARISC_DIR14R (should be 6, not 5), and added R_PARISC_DPREL21L and R_PARISC_DPREL14R for modutils. * sysdeps/unix/sysv/linux/hppa/syscalls.list: Removed ptrace entry so the ptrace.c wrapper is used. 2001-04-20 Alan Modra <amodra@one.net.au> * sysdeps/hppa/dl-lookupcfg.h (_dl_function_address): Prototype. (DL_FUNCTION_ADDRESS): Define. (DL_DT_INIT_ADDRESS): Define. (DL_DT_FINI_ADDRESS): Define. * sysdeps/hppa/Versions: Add _dl_function_address. * sysdeps/hppa/dl-machine.h (ELF_MACHINE_START_ADDRESS): Define. * sysdeps/hppa/dl-symaddr.c (_dl_start_address): Rename to _dl_function_address.
Diffstat (limited to 'posix/getopt.h')
-rw-r--r--posix/getopt.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/posix/getopt.h b/posix/getopt.h
index 12b7ad568e..c2f01804c9 100644
--- a/posix/getopt.h
+++ b/posix/getopt.h
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 1996-1999, 2001 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
@@ -93,7 +93,7 @@ extern int optopt;
struct option
{
-# if defined __STDC__ && __STDC__
+# if (defined __STDC__ && __STDC__) || defined __cplusplus
const char *name;
# else
char *name;
@@ -137,7 +137,7 @@ struct option
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
-#if defined __STDC__ && __STDC__
+#if (defined __STDC__ && __STDC__) || defined __cplusplus
# ifdef __GNU_LIBRARY__
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation