[Emacs-diffs] trunk r113857: Fix OSX 10.4 compiler errors.

[Jan D.]

------------------------------------------------------------
revno: 113857
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 22:18:30 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsmenu.m                   nsmenu.m-20091113204419-o5vbwnq5f7feedwu-8744

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-13 18:22:04 +0000
+++ b/src/ChangeLog     2013-08-13 20:18:30 +0000
@@ -1,3 +1,8 @@
+2013-08-13  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * image.c (imagemagick_filename_hint): Check for errors in the

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2013-08-11 15:34:26 +0000
+++ b/src/nsmenu.m      2013-08-13 20:18:30 +0000
@@ -504,9 +504,11 @@
 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 @@
   /* 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