diff src/xfns.c @ 111094:0c681b288c59

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.

--- 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 <Xm/Xm.h>
 #include <Xm/DialogS.h>
 #include <Xm/FileSB.h>
+#include <Xm/List.h>
+#include <Xm/TextF.h>
 #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;