aboutsummaryrefslogtreecommitdiff
path: root/libobjc/objc
diff options
context:
space:
mode:
authorNicola Pero <nicola.pero@meta-innovation.com>2010-10-17 19:33:19 +0000
committerNicola Pero <nicola@gcc.gnu.org>2010-10-17 19:33:19 +0000
commit5b8b526e694bca2034af4cdeb8ad15e356446a98 (patch)
tree21e63a2c01fdd1ab461d151039afa15a5bfe542e /libobjc/objc
parent91b90ead334deba8a963afbf1cb6947ca16bf2ff (diff)
downloadgcc-5b8b526e694bca2034af4cdeb8ad15e356446a98.zip
gcc-5b8b526e694bca2034af4cdeb8ad15e356446a98.tar.gz
gcc-5b8b526e694bca2034af4cdeb8ad15e356446a98.tar.bz2
In gcc/: 2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com>
In gcc/: 2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com> * doc/objc.texi (GNU Objective-C runtime API): New section. (Modern GNU Objective-C runtime API): New section. (Traditional GNU Objective-C runtime API): New section. (Executing code before main): Mention that this section is specific to the GNU Objective-C runtime. (Garbage Collection): Same. In gcc/testsuite/: 2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com> * obj-c++.dg/gnu-api-2-class.mm: New. * obj-c++.dg/gnu-api-2-ivar.mm: New. * obj-c++.dg/gnu-api-2-method.mm: New. * obj-c++.dg/gnu-api-2-objc.mm: New. * obj-c++.dg/gnu-api-2-object.mm: New. * obj-c++.dg/gnu-api-2-property.mm: New. * obj-c++.dg/gnu-api-2-protocol.mm: New. * obj-c++.dg/gnu-api-2-sel.mm: New. In libobjc/: 2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com> * objc/message.h: Moved initial includes outside of extern "C". * objc/runtime.h: Add extern "C" for Objective-C++. From-SVN: r165595
Diffstat (limited to 'libobjc/objc')
-rw-r--r--libobjc/objc/message.h6
-rw-r--r--libobjc/objc/runtime.h8
2 files changed, 11 insertions, 3 deletions
diff --git a/libobjc/objc/message.h b/libobjc/objc/message.h
index f0038e7..b87153e 100644
--- a/libobjc/objc/message.h
+++ b/libobjc/objc/message.h
@@ -26,13 +26,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#ifndef __objc_message_INCLUDE_GNU
#define __objc_message_INCLUDE_GNU
+#include "objc.h"
+#include "objc-decls.h"
+
#ifdef __cplusplus
extern "C" {
#endif
-#include "objc.h"
-#include "objc-decls.h"
-
/* This file includes declarations of the messaging functions and
types.
*/
diff --git a/libobjc/objc/runtime.h b/libobjc/objc/runtime.h
index 0b6f3df..b37eee2 100644
--- a/libobjc/objc/runtime.h
+++ b/libobjc/objc/runtime.h
@@ -50,6 +50,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "objc.h"
#include "objc-decls.h"
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
/* An 'Ivar' represents an instance variable. It holds information
about the name, type and offset of the instance variable. */
typedef struct objc_ivar *Ivar;
@@ -1042,4 +1046,8 @@ void objc_layout_structure_get_info (struct objc_struct_layout *layout,
unsigned int *align,
const char **type);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif