emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: recent int->bool change broke macosx build


From: Paul Eggert
Subject: Re: recent int->bool change broke macosx build
Date: Wed, 10 Oct 2012 17:36:58 -0700
User-agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120912 Thunderbird/15.0.1

Thanks, I fixed that as follows; this addresses a similar
issue in w32select.c so I am CC'ing this to Eli.

=== modified file 'src/ChangeLog'
--- src/ChangeLog       2012-10-10 20:09:47 +0000
+++ src/ChangeLog       2012-10-11 00:31:57 +0000
@@ -1,3 +1,9 @@
+2012-10-11  Paul Eggert  <address@hidden>
+
+       * w32select.c (waiting_for_input): Declare by including "keyboard.h"
+       instead of having a wrong decl.
+       * nsmenu.m (waiting_for_input): Remove wrong decl.
+
 2012-10-10  Paul Eggert  <address@hidden>
 
        keyboard.c, keymap.c: Use bool for booleans.

=== modified file 'src/nsmenu.m'
--- src/nsmenu.m        2012-10-10 20:09:47 +0000
+++ src/nsmenu.m        2012-10-11 00:25:06 +0000
@@ -128,7 +128,6 @@
   static EmacsMenu *last_submenu = nil;
   BOOL needsSet = NO;
   const char *submenuTitle = [[submenu title] UTF8String];
-  extern int waiting_for_input;
   bool owfi;
   Lisp_Object items;
   widget_value *wv, *first_wv, *prev_wv = 0;

=== modified file 'src/w32select.c'
--- src/w32select.c     2012-10-08 12:53:18 +0000
+++ src/w32select.c     2012-10-11 00:30:32 +0000
@@ -76,6 +76,7 @@
 #include "lisp.h"
 #include "w32term.h"   /* for all of the w32 includes */
 #include "w32common.h" /* os_subtype */
+#include "keyboard.h"
 #include "blockinput.h"
 #include "charset.h"
 #include "coding.h"
@@ -393,7 +394,6 @@
      with global variables and calling strange looking functions.  Is
      this really the right way to run Lisp callbacks?  */
 
-  extern int waiting_for_input; /* from keyboard.c */
   int owfi;
 
   block_input ();





reply via email to

[Prev in Thread] Current Thread [Next in Thread]