* Build error in NeXTstep (Mac OS X) Build of Emacs
@ 2011-03-27 5:01 Ben Key
2011-03-27 12:07 ` Juanma Barranquero
0 siblings, 1 reply; 3+ messages in thread
From: Ben Key @ 2011-03-27 5:01 UTC (permalink / raw)
To: Emacs-devel
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
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.
1. 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.
2. 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>
[-- Attachment #2: Type: text/html, Size: 1387 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Build error in NeXTstep (Mac OS X) Build of Emacs
2011-03-27 5:01 Build error in NeXTstep (Mac OS X) Build of Emacs Ben Key
@ 2011-03-27 12:07 ` Juanma Barranquero
2011-03-27 12:08 ` Juanma Barranquero
0 siblings, 1 reply; 3+ messages in thread
From: Juanma Barranquero @ 2011-03-27 12:07 UTC (permalink / raw)
To: Ben Key; +Cc: Emacs-devel
On Sun, Mar 27, 2011 at 07:01, Ben Key <bkey76@gmail.com> wrote:
> 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.
Sorry! I checked all the .h and .c files, and forgot about the .m source files.
> 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.
I'll commit it ASAP.
Thanks,
Juanma
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-27 12:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-27 5:01 Build error in NeXTstep (Mac OS X) Build of Emacs Ben Key
2011-03-27 12:07 ` Juanma Barranquero
2011-03-27 12:08 ` Juanma Barranquero
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.