summaryrefslogtreecommitdiff
path: root/libobjc
diff options
context:
space:
mode:
authornicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2010-10-17 19:33:19 +0000
committernicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2010-10-17 19:33:19 +0000
commit116d575b68536cd6caca51dc03fa067192f46002 (patch)
tree21e63a2c01fdd1ab461d151039afa15a5bfe542e /libobjc
parentb54b6a4d94f53adb98061eab3b52b99af36eb69c (diff)
downloadgcc-116d575b68536cd6caca51dc03fa067192f46002.tar.gz
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++. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165595 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
-rw-r--r--libobjc/ChangeLog7
-rw-r--r--libobjc/objc/message.h6
-rw-r--r--libobjc/objc/runtime.h8
3 files changed, 17 insertions, 4 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 6e70ac762ea..3c79186211b 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,12 +1,17 @@
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++.
+
+2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com>
+
* init.c (objc_send_load): Do not wait for NXConstantString to be
registered before executing +load. There is no point if
-fconstant-string-class=xxx is used when compiling all modules,
as is the case for almost all users.
* linking.m (__objc_linking): Do not try to forcefully link in
NXConstantString.
-
+
2010-10-16 Nicola Pero <nicola.pero@meta-innovation.com>
* objc/runtime.h: Updated comments.
diff --git a/libobjc/objc/message.h b/libobjc/objc/message.h
index f0038e714ac..b87153ea61c 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 0b6f3dfc99b..b37eee2125b 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