emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/src nsterm.h


From: Adrian Robert
Subject: [Emacs-diffs] emacs/src nsterm.h
Date: Fri, 16 Oct 2009 03:09:06 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/10/16 03:09:06

Modified files:
        src            : nsterm.h 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.h?cvsroot=emacs&r1=1.28&r2=1.29

Patches:
Index: nsterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- nsterm.h    12 Oct 2009 00:26:45 -0000      1.28
+++ nsterm.h    16 Oct 2009 03:09:06 -0000      1.29
@@ -54,7 +54,7 @@
 
 @class EmacsToolbar;
 
address@hidden EmacsView : NSView <NSTextInput,NSWindowDelegate>
address@hidden EmacsView : NSView <NSTextInput> /* 10.6+: NSWindowDelegate */
    {
    char *old_title;
    BOOL windowClosing;
@@ -104,7 +104,7 @@
 
    ========================================================================== 
*/
 
address@hidden EmacsMenu : NSMenu <NSMenuDelegate>
address@hidden EmacsMenu : NSMenu  /* 10.6+: <NSMenuDelegate> */
 {
   struct frame *frame;
   unsigned long keyEquivModMask;
@@ -131,7 +131,7 @@
 
 @class EmacsImage;
 
address@hidden EmacsToolbar : NSToolbar <NSToolbarDelegate>
address@hidden EmacsToolbar : NSToolbar  /* 10.6+: <NSToolbarDelegate> */
    {
      EmacsView *emacsView;
      NSMutableDictionary *identifierToItem;
@@ -174,7 +174,7 @@
 - (Lisp_Object)runDialogAt: (NSPoint)p;
 @end
 
address@hidden EmacsTooltip : NSObject <NSWindowDelegate>
address@hidden EmacsTooltip : NSObject  /* 10.6+: <NSWindowDelegate> */
   {
     NSWindow *win;
     NSTextField *textField;
@@ -328,6 +328,18 @@
 @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__ */
 
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]