summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-04-05 12:39:27 -0400
committerPietro Gagliardi <[email protected]>2014-04-05 12:39:27 -0400
commit338cbc0540c810dec2b32bae39f7d367b2d73396 (patch)
treefb2f34f91b46b9c950d451246a99accad434cfb7
parentb97e6b864f2bb6c3ffbc12cba81f3be250f48d92 (diff)
Removed NilClass from the shared Mac OS X files (objc_darwin.h and bleh_darwin.m) as the //export issue that required that no longer applies.
-rw-r--r--bleh_darwin.m3
-rw-r--r--objc_darwin.go2
-rw-r--r--objc_darwin.h3
3 files changed, 2 insertions, 6 deletions
diff --git a/bleh_darwin.m b/bleh_darwin.m
index 0e1cce5..e324133 100644
--- a/bleh_darwin.m
+++ b/bleh_darwin.m
@@ -21,9 +21,6 @@ though this is not always the case.
#include <AppKit/NSBitmapImageRep.h>
#include <AppKit/NSCell.h>
-/* exception to the above: cgo doesn't like Nil and delegate_darwin.go has //export so I can't have this there */
-Class NilClass = Nil;
-
/* used by listbox_darwin.go; requires NSString */
id *_NSObservedObjectKey = (id *) (&NSObservedObjectKey);
diff --git a/objc_darwin.go b/objc_darwin.go
index 70406f5..d7e8f7a 100644
--- a/objc_darwin.go
+++ b/objc_darwin.go
@@ -10,6 +10,8 @@ import (
// #cgo LDFLAGS: -lobjc -framework Foundation
// #include <stdlib.h>
// #include "objc_darwin.h"
+// /* cgo doesn't like Nil */
+// Class NilClass = Nil;
import "C"
func objc_getClass(class string) C.id {
diff --git a/objc_darwin.h b/objc_darwin.h
index 4c1b77a..05f39e3 100644
--- a/objc_darwin.h
+++ b/objc_darwin.h
@@ -20,9 +20,6 @@ The format should be self-explanatory.
#include <stdint.h>
-/* for delegate_darwin.go */
-extern Class NilClass;
-
/* for listbox_darwin.go */
extern id *_NSObservedObjectKey;