X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libobjc%2Fobjc%2Ftypedstream.h;h=826ebe547174b84ee3ec53b46f24bc3863d3eaa9;hp=eb4642f344be82a159b59d4d00e0a824b9a02201;hb=b51dff7bc17fe06526e7d2d81c9f8923984d86b0;hpb=3c3646e7b4f35087afe496fec35447862fb3ff1a

diff --git a/libobjc/objc/typedstream.h b/libobjc/objc/typedstream.h
index eb4642f344b..826ebe54717 100644
--- a/libobjc/objc/typedstream.h
+++ b/libobjc/objc/typedstream.h
@@ -1,20 +1,20 @@
 /* GNU Objective-C Typed Streams interface.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2004 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify it
+GCC is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 Free Software Foundation; either version 2, or (at your option) any
 later version.
 
-GNU CC is distributed in the hope that it will be useful, but WITHOUT
+GCC is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+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.  */
 
@@ -27,8 +27,13 @@ Boston, MA 02111-1307, USA.  */
 #ifndef __typedstream_INCLUDE_GNU
 #define __typedstream_INCLUDE_GNU
 
-#include "objc/objc.h"
-#include "objc/hash.h"
+#include <objc/objc.h>
+#include <objc/hash.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <stdio.h>
 
 typedef int (*objc_typed_read_func)(void*, char*, int);
@@ -99,7 +104,7 @@ int objc_read_types (TypedStream* stream, const char* type, ...);
 int objc_write_object_reference (TypedStream* stream, id object);
 int objc_write_root_object (TypedStream* stream, id object);
 
-long objc_get_stream_class_version (TypedStream* stream, Class class);
+long objc_get_stream_class_version (TypedStream* stream, Class class_type);
 
 
 /*
@@ -129,4 +134,8 @@ void objc_close_typed_stream (TypedStream* stream);
 BOOL objc_end_of_typed_stream (TypedStream* stream);
 void objc_flush_typed_stream (TypedStream* stream);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* not __typedstream_INCLUDE_GNU */