diff options
| author | Paul Eggert | 2018-12-17 08:11:55 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-17 08:16:17 -0800 |
| commit | e8bb0420a0a0aefc35932c9b5ee3167f6b237def (patch) | |
| tree | 4b61862a52836289106930fc03d5673ff2b4656c /lwlib | |
| parent | fa953b58afd39d396dab4d76a6ff0b8ba4040eb8 (diff) | |
| download | emacs-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.h | 6 | ||||
| -rw-r--r-- | lwlib/lwlib-Xlw.h | 6 | ||||
| -rw-r--r-- | lwlib/lwlib.h | 6 |
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 | |||
| 15 | xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean); | 15 | xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean); |
| 16 | 16 | ||
| 17 | void | 17 | void |
| 18 | xaw_update_one_value (widget_instance *, Widget, widget_value *) | 18 | xaw_update_one_value (widget_instance *, Widget, widget_value *); |
| 19 | ATTRIBUTE_CONST; | ||
| 20 | 19 | ||
| 21 | void | 20 | void |
| 22 | xaw_destroy_instance (widget_instance *); | 21 | xaw_destroy_instance (widget_instance *); |
| 23 | 22 | ||
| 24 | void | 23 | void |
| 25 | xaw_popup_menu (Widget, XEvent *) | 24 | xaw_popup_menu (Widget, XEvent *); |
| 26 | ATTRIBUTE_CONST; | ||
| 27 | 25 | ||
| 28 | void | 26 | void |
| 29 | xaw_pop_instance (widget_instance *, Boolean); | 27 | xaw_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 | ||
| 16 | void | 16 | void |
| 17 | xlw_update_one_value (widget_instance* instance, Widget widget, | 17 | xlw_update_one_value (widget_instance* instance, Widget widget, |
| 18 | widget_value* val) | 18 | widget_value* val); |
| 19 | ATTRIBUTE_CONST; | ||
| 20 | 19 | ||
| 21 | void | 20 | void |
| 22 | xlw_destroy_instance (widget_instance* instance); | 21 | xlw_destroy_instance (widget_instance* instance); |
| 23 | 22 | ||
| 24 | void | 23 | void |
| 25 | xlw_pop_instance (widget_instance* instance, Boolean up) | 24 | xlw_pop_instance (widget_instance* instance, Boolean up); |
| 26 | ATTRIBUTE_CONST; | ||
| 27 | 25 | ||
| 28 | void | 26 | void |
| 29 | xlw_popup_menu (Widget widget, XEvent * event); | 27 | xlw_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); | |||
| 111 | Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget); | 111 | Boolean 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 | ||
| 115 | ATTRIBUTE_CONST | ||
| 116 | #endif | ||
| 117 | void lw_allow_resizing (Widget w, Boolean flag); | 114 | void 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 | ||
| 121 | ATTRIBUTE_CONST | ||
| 122 | #endif | ||
| 123 | void lw_set_main_areas (Widget parent, | 117 | void lw_set_main_areas (Widget parent, |
| 124 | Widget menubar, | 118 | Widget menubar, |
| 125 | Widget work_area); | 119 | Widget work_area); |