diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-10 09:30:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-10 09:31:59 -0800 |
| commit | ec168376d1d961be9adceaafcbff04d5b2b0a492 (patch) | |
| tree | e714c3bc5e3c5323ddbf936c382a0ba079307618 /lwlib/lwlib-Xm.c | |
| parent | 817c4d1a3055a12ab2f1a6a06479b5eb4d66286b (diff) | |
| download | emacs-ec168376d1d961be9adceaafcbff04d5b2b0a492.tar.gz emacs-ec168376d1d961be9adceaafcbff04d5b2b0a492.tar.bz2 emacs-ec168376d1d961be9adceaafcbff04d5b2b0a492.zip | |
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
Diffstat (limited to 'lwlib/lwlib-Xm.c')
| -rw-r--r-- | lwlib/lwlib-Xm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 6e1e0d69216..b18429067d8 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -22,7 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <unistd.h> #include <stdio.h> -#include <stdlib.h> #include <setjmp.h> #include <X11/StringDefs.h> @@ -504,14 +503,14 @@ make_menu_in_widget (widget_instance* instance, /* WIDGET should be a RowColumn. */ if (!XmIsRowColumn (widget)) - abort (); + emacs_abort (); /* Determine whether WIDGET is a menu bar. */ type = -1; XtSetArg (al[0], XmNrowColumnType, &type); XtGetValues (widget, al, 1); if (type != XmMENU_BAR && type != XmMENU_PULLDOWN && type != XmMENU_POPUP) - abort (); + emacs_abort (); menubar_p = type == XmMENU_BAR; /* Add a callback to popups and pulldowns that is called when @@ -528,7 +527,7 @@ make_menu_in_widget (widget_instance* instance, /* Check that those are all we have (the caller should have deleted the rest). */ if (old_num_children != keep_first_children) - abort (); + emacs_abort (); /* Create the rest. */ for (child_index = keep_first_children; cur; child_index++, cur = cur->next) @@ -677,7 +676,7 @@ update_one_menu_entry (widget_instance* instance, if (strcmp (XtName (widget_list[i]), XtName (widget)) == 0) break; if (i == old_num_children) - abort (); + emacs_abort (); if (XmIsCascadeButton (widget_list[i])) { menu = XmCreatePulldownMenu (parent, XtName(widget), NULL, 0); @@ -1829,7 +1828,7 @@ do_call (Widget widget, break; default: - abort (); + emacs_abort (); } } |