From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 13 Aug 2013 20:18:30 +0000 (+0200)
Subject: Fix OSX 10.4 compiler errors.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~266
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5bd5abb645ea5c0e5bb45425128166af44dc237;p=emacs.git

Fix OSX 10.4 compiler errors.
* nsmenu.m (x_activate_menubar): Check for OSX >= 10.5
(trackingNotification:): Call ns_check_menu_open only for OSX >= 10.5.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index af76a0c3780..0c0583684dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsmenu.m (x_activate_menubar): Check for OSX >= 10.5
+	(trackingNotification:): Call ns_check_menu_open only for OSX >= 10.5.
+
 2013-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* image.c (imagemagick_filename_hint): Check for errors in the
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2850f0ed97d..3266d76450c 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -504,9 +504,11 @@ void
 x_activate_menubar (struct frame *f)
 {
 #ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
   ns_update_menubar (f, true, nil);
   ns_check_pending_open_menu ();
 #endif
+#endif
 }
 
 
@@ -563,7 +565,9 @@ extern NSString *NSMenuDidBeginTrackingNotification;
   /* Update menu in menuNeedsUpdate only while tracking menus.  */
   trackingMenu = ([notification name] == NSMenuDidBeginTrackingNotification
                   ? 1 : 0);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
   if (! trackingMenu) ns_check_menu_open (nil);
+#endif
 }
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5