From 2e1a9c3c9d9f34118e8274e25ad21902132f2929 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sun, 27 Oct 2002 01:02:05 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 4 ++++ include/getopt.h | 4 ++-- include/partition.h | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index bac0506f62c..8efd9a3cd0b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2002-10-26 Roger Sayle + + * partition.h: Close the extern "C" scope when compiling with C++. + 2002-10-26 Roger Sayle DJ Delorie diff --git a/include/getopt.h b/include/getopt.h index 9495a4846fd..a99a2290159 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 885a79b4ba3..5d3623f716e 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 */ -- 2.30.2