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 --git a/src/ChangeLog b/src/ChangeLog
index 1b1de29a0f11c94caef40b48baa28182ec8b9510..05a0d4421499122cd9f1257fd17b29759e9559ad 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * 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  <rgm@gnu.org>
 
        * Makefile.in (SOME_MACHINE_LISP): Add w32-vars.

diff --git a/src/xfns.c b/src/xfns.c
index cb6733e8fa12603b0fd7e82b64d4012dbdbdabbc..b2f8222c6ec19f3bf7c472cd9d5ef91b8593758f 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -99,6 +99,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 @@ DEFUN ("x-uses-old-gtk-dialog", Fx_uses_old_gtk_dialog,
 /* 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 @@ file_dialog_cb (widget, client_data, call_data)
    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 --git a/src/xmenu.c b/src/xmenu.c
index 68b442388a56b44fa3de4326cec6bc2e3770f743..60b1c2b45950e6f496b94b504a90391579d762de 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -89,6 +89,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <X11/Xaw/Paned.h>
 #endif /* HAVE_XAW3D */
 #endif /* USE_LUCID */
+#include "../lwlib/lwlib.h"
 #else /* not USE_X_TOOLKIT */
 #ifndef USE_GTK
 #include "../oldXMenu/XMenu.h"

diff --git a/src/xrdb.c b/src/xrdb.c
index d2898e1d8f8a5aaf261d0b45ccdc6184042d5045..90a85e287bbe11a89225a4c28043853640bcdd94 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -48,6 +48,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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);