summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-10-13 13:13:45 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-10-13 13:13:45 (GMT)
commit8ff3dfaf5a77d7ef96490cc9dc418979e505903f (patch)
tree81b8efb21794284aca2e4002f34b4f20171a7ea4
parent73e618c2bec30116d7b413e8776a74a8fbf4427d (diff)
downloadtcl-8ff3dfaf5a77d7ef96490cc9dc418979e505903f.zip
tcl-8ff3dfaf5a77d7ef96490cc9dc418979e505903f.tar.gz
tcl-8ff3dfaf5a77d7ef96490cc9dc418979e505903f.tar.bz2
Added magic for Objective C. [Bug 2163447]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclOOInt.h17
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2bab9cd..d021174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-13 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tclOOInt.h: Added macro magic to make things work with
+ Objective C. [Bug 2163447]
+
2008-10-12 Miguel Sofer <msofer@users.sf.net>
* generic/tclCompile.c: fix bug in srcDelta encoding within
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index dbd7df2..4b6b8a0 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -9,13 +9,26 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclOOInt.h,v 1.8 2008/09/23 05:05:54 dkf Exp $
+ * RCS: @(#) $Id: tclOOInt.h,v 1.9 2008/10/13 13:13:45 dkf Exp $
*/
+#ifndef TCL_OO_INTERNAL_H
+#define TCL_OO_INTERNAL_H 1
+
#include <tclInt.h>
#include "tclOO.h"
/*
+ * Hack to make things work with Objective C. Note that ObjC isn't really
+ * supported, but we don't want to to be actively hostile to it. [Bug 2163447]
+ */
+
+#ifdef __OBJC__
+#define Class TclOOClass
+#define Object TclOOObject
+#endif /* __OBJC__ */
+
+/*
* Forward declarations.
*/
@@ -584,6 +597,8 @@ MODULE_SCOPE void TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
ckfree((char *) (ptr)); \
} \
} while(0)
+
+#endif /* TCL_OO_INTERNAL_H */
/*
* Local Variables: