# HG changeset patch # User Jan D # Date 1287726587 -7200 # Node ID 0c681b288c59d835cf4d671e90f4dddd5aa35bf7 # Parent d80a6f7f8b4af9cf3850535de185ea79fc9d25a9 Fix compilation with Motif (Bug#7263). * src/xfns.c: Include Xm/TextF and Xm/List. (file_dialog_cb, file_dialog_unmap_cb, clean_up_file_dialog): Make ANSI prototypes. * src/xmenu.c: Revert 2010-07-27 change: lwlib.h is needed for MOTIF (Bug#7263). * src/xrdb.c: Include keyboard.h for MOTIF. diff -r d80a6f7f8b4a -r 0c681b288c59 src/ChangeLog --- a/src/ChangeLog Fri Oct 22 04:30:27 2010 +0000 +++ b/src/ChangeLog Fri Oct 22 07:49:47 2010 +0200 @@ -1,3 +1,14 @@ +2010-10-22 Jan Djärv + + * xrdb.c: Include keyboard.h for MOTIF. + + * xmenu.c: Revert 2010-07-27 change: lwlib.h is needed for + MOTIF (Bug#7263). + + * xfns.c: Include Xm/TextF and Xm/List. + (file_dialog_cb, file_dialog_unmap_cb, clean_up_file_dialog): Make + ANSI prototypes. + 2010-10-22 Glenn Morris * Makefile.in (SOME_MACHINE_LISP): Add w32-vars. diff -r d80a6f7f8b4a -r 0c681b288c59 src/xfns.c --- a/src/xfns.c Fri Oct 22 04:30:27 2010 +0000 +++ b/src/xfns.c Fri Oct 22 07:49:47 2010 +0200 @@ -99,6 +99,8 @@ #include #include #include +#include +#include #endif #ifdef USE_LUCID @@ -5299,9 +5301,7 @@ /* Callback for "OK" and "Cancel" on file selection dialog. */ static void -file_dialog_cb (widget, client_data, call_data) - Widget widget; - XtPointer call_data, client_data; +file_dialog_cb (Widget widget, XtPointer client_data, XtPointer call_data) { int *result = (int *) client_data; XmAnyCallbackStruct *cb = (XmAnyCallbackStruct *) call_data; @@ -5315,17 +5315,14 @@ in this case. */ static void -file_dialog_unmap_cb (widget, client_data, call_data) - Widget widget; - XtPointer call_data, client_data; +file_dialog_unmap_cb (Widget widget, XtPointer client_data, XtPointer call_data) { int *result = (int *) client_data; *result = XmCR_CANCEL; } static Lisp_Object -clean_up_file_dialog (arg) - Lisp_Object arg; +clean_up_file_dialog (Lisp_Object arg) { struct Lisp_Save_Value *p = XSAVE_VALUE (arg); Widget dialog = (Widget) p->pointer; diff -r d80a6f7f8b4a -r 0c681b288c59 src/xmenu.c --- a/src/xmenu.c Fri Oct 22 04:30:27 2010 +0000 +++ b/src/xmenu.c Fri Oct 22 07:49:47 2010 +0200 @@ -89,6 +89,7 @@ #include #endif /* HAVE_XAW3D */ #endif /* USE_LUCID */ +#include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */ #ifndef USE_GTK #include "../oldXMenu/XMenu.h" diff -r d80a6f7f8b4a -r 0c681b288c59 src/xrdb.c --- a/src/xrdb.c Fri Oct 22 04:30:27 2010 +0000 +++ b/src/xrdb.c Fri Oct 22 07:49:47 2010 +0200 @@ -48,6 +48,11 @@ #include "lisp.h" +#ifdef USE_MOTIF +/* For Vdouble_click_time. */ +#include "keyboard.h" +#endif + extern char *getenv (const char *); extern struct passwd *getpwuid (uid_t);