[Emacs-diffs] /srv/bzr/emacs/trunk r100986: Fix changes in revnos 100982..100984 for Windows build.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100986
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-06 02:16:24 +0200
message:
  Fix changes in revnos 100982..100984 for Windows build.
  
  * dired.c (compile_pattern):
  * syssignal.h (signal_handler_t): Restore declarations.
  
  * w32font.c (Qlatin): Remove declaration.
  
  * menu.h (xmalloc_widget_value, digest_single_submenu): Declare.
  * xmenu.c [USE_X_TOOLKIT || USE_GTK]:
    Don't declare xmalloc_widget_value and digest_single_submenu.
modified:
  src/ChangeLog
  src/dired.c
  src/menu.h
  src/w32font.c
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-05 23:34:12 +0000
+++ b/src/ChangeLog     2010-08-06 00:16:24 +0000
@@ -1,3 +1,17 @@
+2010-08-06  Juanma Barranquero  <address@hidden>
+
+       Fix changes in revnos 100982..100984 for Windows build.
+
+       * xmenu.c [USE_X_TOOLKIT || USE_GTK]:
+       Don't declare xmalloc_widget_value and digest_single_submenu.
+
+       * w32font.c (Qlatin): Remove declaration.
+
+       * menu.h (xmalloc_widget_value, digest_single_submenu): Declare.
+
+       * dired.c (compile_pattern):
+       * syssignal.h (signal_handler_t): Restore declarations.
+
 2010-08-05  Dan Nicolaescu  <address@hidden>
 
        Remove extern declarations in .c files, .h files have them.

=== modified file 'src/dired.c'
--- a/src/dired.c       2010-08-05 23:34:12 +0000
+++ b/src/dired.c       2010-08-06 00:16:24 +0000
@@ -82,6 +82,11 @@
 #include "regex.h"
 #include "blockinput.h"
 
+/* Returns a search buffer, with a fastmap allocated and ready to go.  */
+extern struct re_pattern_buffer *compile_pattern (Lisp_Object,
+                                                 struct re_registers *,
+                                                 Lisp_Object, int, int);
+
 /* From filemode.c.  Can't go in Lisp.h because of `stat'.  */
 extern void filemodestring (struct stat *, char *);
 

=== modified file 'src/menu.h'
--- a/src/menu.h        2010-07-02 09:26:33 +0000
+++ b/src/menu.h        2010-08-06 00:16:24 +0000
@@ -32,6 +32,8 @@
 extern void update_submenu_strings (widget_value *);
 extern void find_and_call_menu_selection (FRAME_PTR, int,
                                           Lisp_Object, void *);
+extern widget_value *xmalloc_widget_value (void);
+extern widget_value *digest_single_submenu (int, int, int);
 #endif
 
 #ifdef HAVE_X_WINDOWS

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2010-07-08 21:25:08 +0000
+++ b/src/w32font.c     2010-08-06 00:16:24 +0000
@@ -72,7 +72,7 @@
 static Lisp_Object Qzh;
 
 /* scripts */
-static Lisp_Object Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian, Qhebrew;
+static Lisp_Object Qgreek, Qcoptic, Qcyrillic, Qarmenian, Qhebrew;
 static Lisp_Object Qarabic, Qsyriac, Qnko, Qthaana, Qdevanagari, Qbengali;
 static Lisp_Object Qgurmukhi, Qgujarati, Qoriya, Qtamil, Qtelugu;
 static Lisp_Object Qkannada, Qmalayalam, Qsinhala, Qthai, Qlao;

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2010-08-05 23:34:12 +0000
+++ b/src/xmenu.c       2010-08-06 00:16:24 +0000
@@ -122,11 +122,6 @@
 
 static int next_menubar_widget_id;
 
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-extern widget_value *xmalloc_widget_value (void);
-extern widget_value *digest_single_submenu (int, int, int);
-#endif
-
 
 #ifdef USE_X_TOOLKIT