diff options
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/dired.c | 5 | ||||
| -rw-r--r-- | src/menu.h | 2 | ||||
| -rw-r--r-- | src/w32font.c | 2 | ||||
| -rw-r--r-- | src/xmenu.c | 5 |
5 files changed, 22 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 21e2f3813fd..53b533863ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2010-08-06 Juanma Barranquero <lekktu@gmail.com> + + Fix changes in 2010-08-05T23:15:24Z!dann@ics.uci.edu..2010-08-05T23:34:12Z!dann@ics.uci.edu 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 --git a/src/dired.c b/src/dired.c index 67f1ad3537a..5bb3f27013c 100644 --- a/src/dired.c +++ b/src/dired.c @@ -82,6 +82,11 @@ extern struct direct *readdir (DIR *); #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 --git a/src/menu.h b/src/menu.h index eff6f5ddf70..99ae43fe452 100644 --- a/src/menu.h +++ b/src/menu.h @@ -32,6 +32,8 @@ extern void free_menubar_widget_value_tree (widget_value *); 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 --git a/src/w32font.c b/src/w32font.c index d1375d58507..46fca5d78d5 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -72,7 +72,7 @@ static Lisp_Object Qstandard, Qsubpixel, Qnatural; 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 --git a/src/xmenu.c b/src/xmenu.c index a723e6389ef..0b24a8f2bd6 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -122,11 +122,6 @@ static int popup_activated_flag; 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 |