[Emacs-diffs] /srv/bzr/emacs/trunk r102047: Fix compilation with Motif (Bug#7263).

[Jan D]

------------------------------------------------------------
revno: 102047
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-22 07:49:47 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xfns.c
  src/xmenu.c
  src/xrdb.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-22 03:37:20 +0000
+++ b/src/ChangeLog     2010-10-22 05:49:47 +0000
@@ -1,3 +1,14 @@
+2010-10-22  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (SOME_MACHINE_LISP): Add w32-vars.

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2010-08-13 13:26:13 +0000
+++ b/src/xfns.c        2010-10-22 05:49:47 +0000
@@ -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;

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2010-08-13 08:32:13 +0000
+++ b/src/xmenu.c       2010-10-22 05:49:47 +0000
@@ -89,6 +89,7 @@
 #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"

=== modified file 'src/xrdb.c'
--- a/src/xrdb.c        2010-09-25 16:25:04 +0000
+++ b/src/xrdb.c        2010-10-22 05:49:47 +0000
@@ -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);