Mercurial > emacs
comparison src/nsterm.h @ 97278:2e16fead73d6
Test directly for NS_HAVE_INTEGER before defining it.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 04 Aug 2008 21:59:02 +0000 |
| parents | eed9154c9cad |
| children | 76ed169d532c |
comparison
equal
deleted
inserted
replaced
| 97277:2f7f25d92700 | 97278:2e16fead73d6 |
|---|---|
| 362 @interface NSApplication (EmacsApp) | 362 @interface NSApplication (EmacsApp) |
| 363 - (void)setAppleMenu: (NSMenu *)menu; | 363 - (void)setAppleMenu: (NSMenu *)menu; |
| 364 @end | 364 @end |
| 365 #endif | 365 #endif |
| 366 | 366 |
| 367 #if defined (NS_IMPL_GNUSTEP) || ( defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4) | 367 #ifndef NS_HAVE_INTEGER |
| 368 typedef long NSInteger; | 368 typedef long NSInteger; |
| 369 typedef unsigned long NSUInteger; | 369 typedef unsigned long NSUInteger; |
| 370 #endif /* NS_IMPL_GNUSTEP || (NS_IMPL_COCOA and <= 10.4) */ | 370 #endif /* not NS_HAVE_INTEGER */ |
| 371 | 371 |
| 372 #endif /* __OBJC__ */ | 372 #endif /* __OBJC__ */ |
| 373 | 373 |
| 374 | 374 |
| 375 | 375 |