Mercurial > emacs
changeset 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 | 2f7f25d92700 |
children | 76ed169d532c |
files | src/nsterm.h |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsterm.h Mon Aug 04 21:58:51 2008 +0000 +++ b/src/nsterm.h Mon Aug 04 21:59:02 2008 +0000 @@ -364,10 +364,10 @@ @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__ */