diff options
| author | YAMAMOTO Mitsuharu | 2019-04-27 15:27:36 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-04-27 15:27:36 +0900 |
| commit | 9921b78a4d0135347917d9cd9cc9f2df8dcc2a3d (patch) | |
| tree | 3129cae7e892bfa8d9145dd576eeb95e8cc8766d /oldXMenu | |
| parent | 28220664714c50996d8318788289e1c69d69b8ab (diff) | |
| download | emacs-9921b78a4d0135347917d9cd9cc9f2df8dcc2a3d.tar.gz emacs-9921b78a4d0135347917d9cd9cc9f2df8dcc2a3d.zip | |
Fix --with-x-toolkit=no build breakage
* oldXMenu/Create.c (XMenuCreate): Add const modifier to variable def_val.
* oldXMenu/Create.c:
* src/frame.h: Add const modifier to return type of x_get_resource_string.
* src/frame.c (x_get_resource_string): Exempt x_get_string_resource from
renaming generic x_* identifiers.
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/Create.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 2ea84e921a1..58d17826623 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c | |||
| @@ -87,7 +87,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 87 | 87 | ||
| 88 | #define XASSOC_TABLE_SIZE 64 | 88 | #define XASSOC_TABLE_SIZE 64 |
| 89 | 89 | ||
| 90 | char *x_get_resource_string (char const *, char const *); | 90 | const char *x_get_resource_string (char const *, char const *); |
| 91 | 91 | ||
| 92 | 92 | ||
| 93 | 93 | ||
| @@ -107,7 +107,7 @@ XMenuCreate(Display *display, Window parent, register char const *def_env) | |||
| 107 | /* Window ID of the menu's parent window. */ | 107 | /* Window ID of the menu's parent window. */ |
| 108 | /* X Defaults program environment name. */ | 108 | /* X Defaults program environment name. */ |
| 109 | { | 109 | { |
| 110 | register char *def_val; /* X Default value temp variable. */ | 110 | register const char *def_val; /* X Default value temp variable. */ |
| 111 | 111 | ||
| 112 | register XMenu *menu; /* Pointer to the new menu. */ | 112 | register XMenu *menu; /* Pointer to the new menu. */ |
| 113 | XMStyle menu_style; /* Menu display style. */ | 113 | XMStyle menu_style; /* Menu display style. */ |