summaryrefslogtreecommitdiff
path: root/lwlib/lwlib.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-03-10 09:30:30 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2017-03-10 09:31:59 -0800
commitec168376d1d961be9adceaafcbff04d5b2b0a492 (patch)
treee714c3bc5e3c5323ddbf936c382a0ba079307618 /lwlib/lwlib.c
parent817c4d1a3055a12ab2f1a6a06479b5eb4d66286b (diff)
downloademacs-ec168376d1d961be9adceaafcbff04d5b2b0a492.tar.gz
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.c')
-rw-r--r--lwlib/lwlib.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 18a46109eb4..fffb17f7c33 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -26,7 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/types.h>
#include <stdio.h>
-#include <stdlib.h>
#include "lwlib-int.h"
#include "lwlib-utils.h"
#include <X11/StringDefs.h>
@@ -721,13 +720,13 @@ instantiate_widget_instance (widget_instance *instance)
{
printf ("No creation function for widget type %s\n",
instance->info->type);
- abort ();
+ emacs_abort ();
}
instance->widget = (*function) (instance);
if (!instance->widget)
- abort ();
+ emacs_abort ();
/* XtRealizeWidget (instance->widget);*/
}
@@ -772,7 +771,7 @@ lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p)
initialize_widget_instance (instance);
}
if (!instance->widget)
- abort ();
+ emacs_abort ();
return instance->widget;
}