From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Fri, 16 Oct 2009 03:09:06 +0000 (+0000)
Subject: (NS_HAVE_NSINTEGER): Back out and augment with CGFloat, still needed under Tiger.
X-Git-Tag: emacs-pretest-23.1.90~782
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cca5bf08fe504bd75898f744d5fe80cc0e9ad29;p=emacs.git

(NS_HAVE_NSINTEGER): Back out and augment with CGFloat, still needed under Tiger.
---

diff --git a/src/nsterm.h b/src/nsterm.h
index d247f900950..29d312a4840 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -54,7 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 @class EmacsToolbar;
 
-@interface EmacsView : NSView <NSTextInput,NSWindowDelegate>
+@interface EmacsView : NSView <NSTextInput> /* 10.6+: NSWindowDelegate */
    {
    char *old_title;
    BOOL windowClosing;
@@ -104,7 +104,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    ========================================================================== */
 
-@interface EmacsMenu : NSMenu <NSMenuDelegate>
+@interface EmacsMenu : NSMenu  /* 10.6+: <NSMenuDelegate> */
 {
   struct frame *frame;
   unsigned long keyEquivModMask;
@@ -131,7 +131,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 @class EmacsImage;
 
-@interface EmacsToolbar : NSToolbar <NSToolbarDelegate>
+@interface EmacsToolbar : NSToolbar  /* 10.6+: <NSToolbarDelegate> */
    {
      EmacsView *emacsView;
      NSMutableDictionary *identifierToItem;
@@ -174,7 +174,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 - (Lisp_Object)runDialogAt: (NSPoint)p;
 @end
 
-@interface EmacsTooltip : NSObject <NSWindowDelegate>
+@interface EmacsTooltip : NSObject  /* 10.6+: <NSWindowDelegate> */
   {
     NSWindow *win;
     NSTextField *textField;
@@ -328,6 +328,18 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
 @end
 #endif
 
+#ifndef NS_HAVE_NSINTEGER
+#if defined(__LP64__) && __LP64__
+typedef double CGFloat;
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+#else
+typedef float CGFloat;
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif /* not LP64 */
+#endif /* not NS_HAVE_NSINTEGER */
+
 #endif  /* __OBJC__ */