[Openmcl-cvs-notifications] r13812 - /trunk/source/objc-bridge/objc-runtime.lisp

[rme at clozure.com]

Author: rme
Date: Fri Jun 11 14:51:54 2010
New Revision: 13812

Log:
Don't need to define foreign types for NSInteger, etc., now that we
target Leopard.

Don't need Carbon (so use only :cocoa interfaces for both apple-objc
and cocotron-objc).

Modified:
    trunk/source/objc-bridge/objc-runtime.lisp

Modified: trunk/source/objc-bridge/objc-runtime.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/objc-bridge/objc-runtime.lisp (original)
+++ trunk/source/objc-bridge/objc-runtime.lisp Fri Jun 11 14:51:54 2010
@@ -42,12 +42,7 @@
           `(@ ,string)))))))
 =

 (eval-when (:compile-toplevel :execute)
-  #+apple-objc
-  (progn
-    (use-interface-dir :cocoa)
-    #+nomore
-    (use-interface-dir :carbon))        ; need :carbon for things in this =
file
-  #+cocotron-objc
+  #+(or apple-objc cocotron-objc)
   (use-interface-dir :cocoa)
   #+gnu-objc
   (use-interface-dir :gnustep))
@@ -58,16 +53,6 @@
   (require "OBJC-PACKAGE")
   (require "NAME-TRANSLATION")
   (require "OBJC-CLOS"))
-
-;;; NSInteger and NSUInteger probably belong here.
-;;; CGFloat not so much.
-
-#-(or apple-objc-2.0 cocotron-objc)
-(progn
-  (def-foreign-type #>CGFloat :float)
-  (def-foreign-type #>NSUInteger :unsigned)
-  (def-foreign-type #>NSInteger :signed)
-  )
 =

 (defconstant +cgfloat-zero+
   #+(and (or apple-objc-2.0 cocotron-objc) 64-bit-target) 0.0d0