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 af76a0c3780f90a9dc0c2953c87a4db9bc73962c..0c0583684dc9e3060e56b72a712251d99e02a6bf 100644 (file)
--- 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 2850f0ed97d2753ce117cdcd935f410a3f8ede86..3266d76450c9f227590d65b6d187dde09692e764 100644 (file)
--- 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