diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-10-22 07:49:47 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-10-22 07:49:47 +0200 |
| commit | dee186b61d9f2528ed1f2125035dd7e5e5a12f2a (patch) | |
| tree | 2e991f97d72e6571edd739052ab75d26c2d7a90a /src/xfns.c | |
| parent | 48c9482c111b767915f47e398bc7c69dc7d20c57 (diff) | |
| download | emacs-dee186b61d9f2528ed1f2125035dd7e5e5a12f2a.tar.gz | |
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.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/xfns.c b/src/xfns.c index cb6733e8fa1..b2f8222c6ec 100644 --- 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; |