merge from gcc

2002-10-27 01:02:05 +00:00 · 2002-10-27 01:02:05 +00:00 · aaa7b02155
parent 238c78807d
commit aaa7b02155
3 changed files with 10 additions and 2 deletions
--- 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>

--- 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.
--- 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 */