This commit was generated by cvs2svn to compensate for changes in r169693,

which included commits to RCS files with non-trunk default branches.

1 files changed, 11 insertions, 6 deletions

diff --git a/contrib/libobjc/objc/Protocol.h b/contrib/libobjc/objc/Protocol.h
index b39edf8..fe0f28a 100644
--- a/contrib/libobjc/objc/Protocol.h
+++ b/contrib/libobjc/objc/Protocol.h
@@ -1,5 +1,5 @@
 /* Declare the class Protocol for Objective C programs.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
@@ -27,7 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #ifndef __Protocol_INCLUDE_GNU
 #define __Protocol_INCLUDE_GNU
 
-#include "objc/Object.h"
+#include "Object.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 @interface Protocol : Object
 {
@@ -52,7 +56,8 @@ Boston, MA 02111-1307, USA.  */
 
 @end
 
-
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* not __Protocol_INCLUDE_GNU */