From cd1c5ce121ba476ca1472cd6f84a15a34c5b2d65 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 4 Aug 2008 21:59:02 +0000
Subject: [PATCH] Test directly for NS_HAVE_INTEGER before defining it.

---
 src/nsterm.h | 4 ++--
 1 file 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__ */
 
-- 
2.39.2