mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00
Code Issues Projects Releases Wiki Activity

* nsterm.h: Fix CGFloat for OSX 10.4.

Browse source 
Fixes: debbugs:15086
This commit is contained in:
Jan Djärv 2013-08-13 17:39:14 +02:00
parent c8ae93b089
commit f10490f024
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2013-08-13 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086).
2013-08-13 Dmitry Antipov <dmantipov@yandex.ru>
* window.h (WINDOW_FRINGE_EXTENDED_P): New macro.

33
src/nsterm.h
View file

@ -53,9 +53,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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 @@ 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__ */