aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-10-27 01:02:05 +0000
committerDJ Delorie <dj@redhat.com>2002-10-27 01:02:05 +0000
commit2e1a9c3c9d9f34118e8274e25ad21902132f2929 (patch)
tree4a24e8475fcd84759b1c050efd486c49c1a686b2
parentca9da28eb9b81bd841668a8f2eef235ee8a575ee (diff)
downloadgdb-2e1a9c3c9d9f34118e8274e25ad21902132f2929.zip
gdb-2e1a9c3c9d9f34118e8274e25ad21902132f2929.tar.gz
gdb-2e1a9c3c9d9f34118e8274e25ad21902132f2929.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog4
-rw-r--r--include/getopt.h4
-rw-r--r--include/partition.h4
3 files changed, 10 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index bac0506..8efd9a3 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,4 +1,8 @@
2002-10-26 Roger Sayle <roger@eyesopen.com>
+
+ * partition.h: Close the extern "C" scope when compiling with C++.
+
+2002-10-26 Roger Sayle <roger@eyesopen.com>
DJ Delorie <dj@redhat.com>
PR bootstrap/8351
diff --git a/include/getopt.h b/include/getopt.h
index 9495a48..a99a229 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,6 +1,6 @@
/* Declarations for getopt.
- Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000
- Free Software Foundation, Inc.
+ Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000,
+ 2002 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@gnu.org.
diff --git a/include/partition.h b/include/partition.h
index 885a79b..5d3623f 100644
--- a/include/partition.h
+++ b/include/partition.h
@@ -78,4 +78,8 @@ extern void partition_print PARAMS((partition,
#define partition_find(partition__, element__) \
((partition__)->elements[(element__)].class_element)
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif /* _PARTITION_H */