[Emacs-diffs] emacs/src nsmenu.m ChangeLog

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/21 16:34:26

Modified files:
        src            : nsmenu.m ChangeLog 

Log message:
        * nsmenu.m (NSMENUPROFILE): Change #if style.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7287&r2=1.7288

Patches:
Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- nsmenu.m    8 Jan 2009 03:15:52 -0000       1.12
+++ nsmenu.m    21 Jan 2009 16:34:24 -0000      1.13
@@ -36,9 +36,12 @@
 #include "termhooks.h"
 #include "keyboard.h"
 
-/* for profiling */
+#define NSMENUPROFILE 0
+
+#if NSMENUPROFILE
 #include <sys/timeb.h>
 #include <sys/types.h>
+#endif
 
 #define MenuStagger 10.0
 
@@ -114,7 +117,6 @@
     2) deep_p = 1, submenu = nil: Recompute all submenus.
     3) deep_p = 1, submenu = non-nil: Update contents of a single submenu.
    -------------------------------------------------------------------------- 
*/
-/*#define NSMENUPROFILE 1 */
 void
 ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
 {
@@ -129,7 +131,7 @@
   widget_value *wv, *first_wv, *prev_wv = 0;
   int i;
 
-#ifdef NSMENUPROFILE
+#if NSMENUPROFILE
   struct timeb tb;
   long t;
 #endif
@@ -163,7 +165,7 @@
         [attMenu close];
     }
 
-#ifdef NSMENUPROFILE
+#if NSMENUPROFILE
   ftime (&tb);
   t = -(1000*tb.time+tb.millitm);
 #endif
@@ -329,7 +331,7 @@
             {
               /* No change.. */
 
-#ifdef NSMENUPROFILE
+#if NSMENUPROFILE
               ftime (&tb);
               t += 1000*tb.time+tb.millitm;
               fprintf (stderr, "NO CHANGE!  CUTTING OUT after %ld msec.\n", t);
@@ -480,7 +482,7 @@
   free_menubar_widget_value_tree (first_wv);
 
 
-#ifdef NSMENUPROFILE
+#if NSMENUPROFILE
   ftime (&tb);
   t += 1000*tb.time+tb.millitm;
   fprintf (stderr, "Menu update took %ld msec.\n", t);

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7287
retrieving revision 1.7288
diff -u -b -r1.7287 -r1.7288
--- ChangeLog   19 Jan 2009 16:40:30 -0000      1.7287
+++ ChangeLog   21 Jan 2009 16:34:24 -0000      1.7288
@@ -1,3 +1,8 @@
+2009-01-21  Adrian Robert  <address@hidden>
+
+       * nsmenu.m (NSMENUPROFILE): Change #if style.
+
+
 2009-01-19  Chong Yidong  <address@hidden>
 
        * xfaces.c (Finternal_set_lisp_face_attribute, Fx_list_fonts):