diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-08-04 21:59:02 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-08-04 21:59:02 +0000 |
| commit | cd1c5ce121ba476ca1472cd6f84a15a34c5b2d65 (patch) | |
| tree | e6ef2c6d049aaf878228cbaa345c8a2603d84dbc /src/nsterm.h | |
| parent | 156e00fc6307b2fb5e194ee8e78bcee2c752a219 (diff) | |
| download | emacs-cd1c5ce121ba476ca1472cd6f84a15a34c5b2d65.tar.gz | |
Test directly for NS_HAVE_INTEGER before defining it.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index d2a66aadfef..f0b15b7cdc9 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -364,10 +364,10 @@ extern EmacsMenu *mainMenu, *svcsMenu; @end #endif -#if defined (NS_IMPL_GNUSTEP) || ( defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4) +#ifndef NS_HAVE_INTEGER typedef long NSInteger; typedef unsigned long NSUInteger; -#endif /* NS_IMPL_GNUSTEP || (NS_IMPL_COCOA and <= 10.4) */ +#endif /* not NS_HAVE_INTEGER */ #endif /* __OBJC__ */ |