diff options
| author | Alan Third <alan@idiocy.org> | 2017-05-23 02:42:20 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-23 02:45:13 -0700 |
| commit | 4a485410ce74cafd4e9c344e31f7575464a16113 (patch) | |
| tree | 8e5d40913f094c1f33a85da663ab905ab6d57156 /src/nsterm.h | |
| parent | 107e60f49db71f1869848f0f0ce5ea7dd057366c (diff) | |
| download | emacs-4a485410ce74cafd4e9c344e31f7575464a16113.tar.gz | |
Fix GNUstep build
* src/nsterm.h [NS_IMPL_GNUSTEP]: Add typedefs for Cocoa-only types.
(NSWindowStyleMaskUtilityWindow): #define to NSUtilityWindowMask in
GNUstep and old versions of macOS.
* src/nsfns.m (ns-set-mouse-absolute-pixel-position): Function only
works in cocoa, not GNUstep.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 5da949e1fb1..443a40ed6f5 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -62,6 +62,13 @@ typedef CGFloat EmacsCGFloat; typedef float EmacsCGFloat; #endif +/* FIXME: It looks as though instancetype will be supported in GNUstep + at some point, but I'm not sure what version. */ +#ifdef NS_IMPL_GNUSTEP +typedef id instancetype; +typedef int NSWindowStyleMask; +#endif + /* ========================================================================== Trace support @@ -1290,6 +1297,7 @@ extern char gnustep_base_version[]; /* version tracking */ #define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask #define NSWindowStyleMaskResizable NSResizableWindowMask #define NSWindowStyleMaskTitled NSTitledWindowMask +#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask #define NSAlertStyleCritical NSCriticalAlertStyle #define NSControlSizeRegular NSRegularControlSize #endif |