Commit dee186b6 authored by Jan D's avatar Jan D
Browse files

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.
parent 48c9482c
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.
......
......@@ -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;
......
......@@ -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"
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment