Test directly for NS_HAVE_INTEGER before defining it.

diff --git a/src/nsterm.h b/src/nsterm.h
index d2a66aadfef45e0d25d56b21af613daff03e4481..f0b15b7cdc9038a4cff3b854a70b0375f59072f8 100644 (file)
--- 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__ */