Revision 103754 caused a couple of compilation errors in nsmenu.m due to the fact that the do_it_now parameter of timer_check was still used. The following patch resolves this problem.
There are two changes in this patch.
- Remove the declaration of the timer_check function from nsmenu.m so that the declaration of the function found in keyboard.h will be used.
- Modify the one call to the timer_check function in nsmenu.m so that it no longer attempts to specify a value for the do_it_now parameter.
<patch>
=== modified file 'src/nsmenu.m'
--- src/nsmenu.m 2011-01-25 04:08:28 +0000
+++ src/nsmenu.m 2011-03-27 04:35:16 +0000
@@ -1705,7 +1705,6 @@
- (Lisp_Object)runDialogAt: (NSPoint)p
{
NSInteger ret;
- extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */
/* initiate a session that will be ended by pop_down_menu */
popupSession = [NSApp beginModalSessionForWindow: self];
@@ -1715,7 +1714,7 @@
{
/* Run this for timers.el, indep of atimers; might not return.
TODO: use return value to avoid calling every iteration. */
- timer_check (1);
+ timer_check ();
[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]];
}
</patch>