merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index bac0506f62c5c2f5a476210b857f24183cafd9b6..8efd9a3cd0bbbf916fc08d67293972004bc32bb5 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+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>
 

diff --git a/include/getopt.h b/include/getopt.h
index 9495a4846fde8d57623acb48c0a9ff63aeaf7bb6..a99a2290159a9d60cf28c4627cee8cbe28a62a97 100644 (file)
--- 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 885a79b4ba3299a52285da16d5f98c754d7063ec..5d3623f716eac5c285523f1cb0425a72ca4e1b2b 100644 (file)
--- 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 */