[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsgui.h
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src nsgui.h |
Date: |
Mon, 12 Oct 2009 00:38:28 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/10/12 00:38:28
Modified files:
src : nsgui.h
Log message:
(NSPoint, NSSize) [!__OBJC__]: Define and use CGFloat.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsgui.h?cvsroot=emacs&r1=1.8&r2=1.9
Patches:
Index: nsgui.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsgui.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- nsgui.h 22 Jan 2009 13:55:44 -0000 1.8
+++ nsgui.h 12 Oct 2009 00:38:28 -0000 1.9
@@ -129,12 +129,17 @@
} XRectangle;
#ifndef __OBJC__
-typedef struct _NSPoint { float x, y; } NSPoint;
-typedef struct _NSSize { float width, height; } NSSize;
-typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
+#if defined(__LP64__) && __LP64__
+typedef double CGFloat;
+#else
+typedef float CGFloat;
#endif
+typedef struct _NSPoint { CGFloat x, y; } NSPoint;
+typedef struct _NSSize { CGFloat width, height; } NSSize;
+typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
+#endif /* NOT OBJC */
-#define NativeRectangle struct _NSRect
+#define NativeRectangle NSRect
#define CONVERT_TO_XRECT(xr, nr) \
((xr).x = (nr).origin.x, \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src nsgui.h,
Adrian Robert <=