diff options
| author | DJ Delorie <dj@redhat.com> | 2002-10-27 04:02:05 +0300 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-10-27 04:02:05 +0300 |
| commit | aaa7b0215542becba96360731b1974931ec4b176 (patch) | |
| tree | 100686c446ea6d5eb88ee7a4d3c32b031d8c4cd2 | |
| parent | 238c78807d0a18a534724b6b2fd8a395bee9643b (diff) | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/getopt.h | 4 | ||||
| -rw-r--r-- | include/partition.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index bac0506f6..8efd9a3cd 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 9495a4846..a99a22901 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 885a79b4b..5d3623f71 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 */ |