aboutsummaryrefslogtreecommitdiffstats
path: root/lwlib
diff options
context:
space:
mode:
authorPaul Eggert2018-12-17 08:11:55 -0800
committerPaul Eggert2018-12-17 08:16:17 -0800
commite8bb0420a0a0aefc35932c9b5ee3167f6b237def (patch)
tree4b61862a52836289106930fc03d5673ff2b4656c /lwlib
parentfa953b58afd39d396dab4d76a6ff0b8ba4040eb8 (diff)
downloademacs-e8bb0420a0a0aefc35932c9b5ee3167f6b237def.tar.gz
emacs-e8bb0420a0a0aefc35932c9b5ee3167f6b237def.zip
More porting to GCC 8 of --enable-gcc-warnings
Backport from master. I ran into this when building Emacs 26 with GCC 8 on Fedora 29 x86. * lwlib/lwlib-Xaw.h (xaw_update_one_value, xaw_popup_menu): * lwlib/lwlib-Xlw.h (xlw_update_one_value, xlw_pop_instance): * lwlib/lwlib.h (lw_allow_resizing, lw_set_main_areas) [!USE_MOTIF]: No longer const. * src/emacs-module.c: Ignore -Wcast-function-type.
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/lwlib-Xaw.h6
-rw-r--r--lwlib/lwlib-Xlw.h6
-rw-r--r--lwlib/lwlib.h6
3 files changed, 4 insertions, 14 deletions
diff --git a/lwlib/lwlib-Xaw.h b/lwlib/lwlib-Xaw.h
index 363334b575e..644676f320d 100644
--- a/lwlib/lwlib-Xaw.h
+++ b/lwlib/lwlib-Xaw.h
@@ -15,15 +15,13 @@ void
15xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean); 15xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean);
16 16
17void 17void
18xaw_update_one_value (widget_instance *, Widget, widget_value *) 18xaw_update_one_value (widget_instance *, Widget, widget_value *);
19 ATTRIBUTE_CONST;
20 19
21void 20void
22xaw_destroy_instance (widget_instance *); 21xaw_destroy_instance (widget_instance *);
23 22
24void 23void
25xaw_popup_menu (Widget, XEvent *) 24xaw_popup_menu (Widget, XEvent *);
26 ATTRIBUTE_CONST;
27 25
28void 26void
29xaw_pop_instance (widget_instance *, Boolean); 27xaw_pop_instance (widget_instance *, Boolean);
diff --git a/lwlib/lwlib-Xlw.h b/lwlib/lwlib-Xlw.h
index 2d38eb7be66..b0790dc3a59 100644
--- a/lwlib/lwlib-Xlw.h
+++ b/lwlib/lwlib-Xlw.h
@@ -15,15 +15,13 @@ xlw_update_one_widget (widget_instance* instance, Widget widget,
15 15
16void 16void
17xlw_update_one_value (widget_instance* instance, Widget widget, 17xlw_update_one_value (widget_instance* instance, Widget widget,
18 widget_value* val) 18 widget_value* val);
19 ATTRIBUTE_CONST;
20 19
21void 20void
22xlw_destroy_instance (widget_instance* instance); 21xlw_destroy_instance (widget_instance* instance);
23 22
24void 23void
25xlw_pop_instance (widget_instance* instance, Boolean up) 24xlw_pop_instance (widget_instance* instance, Boolean up);
26 ATTRIBUTE_CONST;
27 25
28void 26void
29xlw_popup_menu (Widget widget, XEvent * event); 27xlw_popup_menu (Widget widget, XEvent * event);
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index 66730fd8d77..41d3e0139d2 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -111,15 +111,9 @@ void lw_refigure_widget (Widget w, Boolean doit);
111Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget); 111Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget);
112 112
113/* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */ 113/* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */
114#ifndef USE_MOTIF
115ATTRIBUTE_CONST
116#endif
117void lw_allow_resizing (Widget w, Boolean flag); 114void lw_allow_resizing (Widget w, Boolean flag);
118 115
119/* Set up the main window. */ 116/* Set up the main window. */
120#ifndef USE_MOTIF
121ATTRIBUTE_CONST
122#endif
123void lw_set_main_areas (Widget parent, 117void lw_set_main_areas (Widget parent,
124 Widget menubar, 118 Widget menubar,
125 Widget work_area); 119 Widget work_area);