[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113847: * nsterm.h: Fix CGFloat for OSX 10.4.
From: |
Jan D. |
Subject: |
[Emacs-diffs] trunk r113847: * nsterm.h: Fix CGFloat for OSX 10.4. |
Date: |
Tue, 13 Aug 2013 15:39:14 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113847
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15086
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 17:39:14 +0200
message:
* nsterm.h: Fix CGFloat for OSX 10.4.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/nsterm.h nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-08-13 15:29:25 +0000
+++ b/src/ChangeLog 2013-08-13 15:39:14 +0000
@@ -1,3 +1,7 @@
+2013-08-13 Jan Djärv <address@hidden>
+
+ * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086).
+
2013-08-13 Dmitry Antipov <address@hidden>
* window.h (WINDOW_FRINGE_EXTENDED_P): New macro.
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2013-08-11 15:34:26 +0000
+++ b/src/nsterm.h 2013-08-13 15:39:14 +0000
@@ -53,9 +53,24 @@
/* CGFloat on GNUStep may be 4 or 8 byte, but functions expect float* for some
versions.
- On Cocoa, functions expect CGFloat*. Make compatible type. */
-#if defined (NS_IMPL_COCOA) || GNUSTEP_GUI_MAJOR_VERSION > 0 || \
- GNUSTEP_GUI_MINOR_VERSION >= 22
+ On Cocoa >= 10.5, functions expect CGFloat*. Make compatible type. */
+#ifdef NS_IMPL_COCOA
+
+#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 */
+
+typedef CGFloat EmacsCGFloat;
+
+#elif GNUSTEP_GUI_MAJOR_VERSION > 0 || GNUSTEP_GUI_MINOR_VERSION >= 22
typedef CGFloat EmacsCGFloat;
#else
typedef float EmacsCGFloat;
@@ -424,18 +439,6 @@
@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__ */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113847: * nsterm.h: Fix CGFloat for OSX 10.4.,
Jan D. <=