Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1339

1 files changed, 5 insertions, 0 deletions

diff --git a/src/macterm.h b/src/macterm.h
index 24c57ae12f8..148f073e4ab 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -575,6 +575,10 @@ enum {
 };
 #endif
 
+#if 0
+/* We can't determine the availability of these enumerators by
+   MAC_OS_X_VERSION_MAX_ALLOWED, because they are defined in
+   MacOSX10.3.9.sdk for Mac OS X 10.4, but not in Mac OS X 10.3.  */
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1040
 /* Gestalt selectors */
 enum {
@@ -583,6 +587,7 @@ enum {
   gestaltSystemVersionBugFix    = 'sys3'
 };
 #endif
+#endif
 
 #ifdef MAC_OSX
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1020