# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1281053784 -7200
# Node ID 8ee3605b9d8af1db5d115498373a83557221e64c
# Parent  e04aa89bb748736ff92f1991774361351b0404d3
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.

diff -r e04aa89bb748 -r 8ee3605b9d8a src/ChangeLog
--- a/src/ChangeLog	Thu Aug 05 17:07:36 2010 -0700
+++ b/src/ChangeLog	Fri Aug 06 02:16:24 2010 +0200
@@ -1,3 +1,17 @@
+2010-08-06  Juanma Barranquero  <lekktu@gmail.com>
+
+	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  <dann@ics.uci.edu>
 
 	Remove extern declarations in .c files, .h files have them.
diff -r e04aa89bb748 -r 8ee3605b9d8a src/dired.c
--- a/src/dired.c	Thu Aug 05 17:07:36 2010 -0700
+++ b/src/dired.c	Fri Aug 06 02:16:24 2010 +0200
@@ -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 *);
 
diff -r e04aa89bb748 -r 8ee3605b9d8a src/menu.h
--- a/src/menu.h	Thu Aug 05 17:07:36 2010 -0700
+++ b/src/menu.h	Fri Aug 06 02:16:24 2010 +0200
@@ -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
diff -r e04aa89bb748 -r 8ee3605b9d8a src/w32font.c
--- a/src/w32font.c	Thu Aug 05 17:07:36 2010 -0700
+++ b/src/w32font.c	Fri Aug 06 02:16:24 2010 +0200
@@ -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;
diff -r e04aa89bb748 -r 8ee3605b9d8a src/xmenu.c
--- a/src/xmenu.c	Thu Aug 05 17:07:36 2010 -0700
+++ b/src/xmenu.c	Fri Aug 06 02:16:24 2010 +0200
@@ -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