# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1217887142 0
# Node ID 2e16fead73d60fc3edae24e981bcadbc5d90c1d0
# Parent  2f7f25d92700a727b041d8ab5cc49237ef97756f
Test directly for NS_HAVE_INTEGER before defining it.

diff -r 2f7f25d92700 -r 2e16fead73d6 src/nsterm.h
--- 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__ */