diff options
| author | Paul Eggert | 2011-03-13 20:23:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-13 20:23:23 -0700 |
| commit | 78320123c17531bc27b47fb56d170029ca734fec (patch) | |
| tree | 6ce9aeb932d5b4308c6d8a28f401430582f04fe9 /src | |
| parent | 59d6fe8344313c6e31a06b7ebd666e9f7be27ff2 (diff) | |
| download | emacs-78320123c17531bc27b47fb56d170029ca734fec.tar.gz emacs-78320123c17531bc27b47fb56d170029ca734fec.zip | |
* dbusbind.c (Fdbus_init_bus): Add cast to avoid warning
if GCC considers string literals to be constants.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/dbusbind.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b062bfdf06d..8a053f05c9d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -7,6 +7,9 @@ | |||
| 7 | (Fdbus_send_signal, xd_read_message_1, Fdbus_register_service): | 7 | (Fdbus_send_signal, xd_read_message_1, Fdbus_register_service): |
| 8 | (Fdbus_register_signal): Use SSDATA when the context wants char *. | 8 | (Fdbus_register_signal): Use SSDATA when the context wants char *. |
| 9 | 9 | ||
| 10 | * dbusbind.c (Fdbus_init_bus): Add cast to avoid warning | ||
| 11 | if GCC considers string literals to be constants. | ||
| 12 | |||
| 10 | 2011-03-13 Chong Yidong <cyd@stupidchicken.com> | 13 | 2011-03-13 Chong Yidong <cyd@stupidchicken.com> |
| 11 | 14 | ||
| 12 | * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT) | 15 | * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT) |
diff --git a/src/dbusbind.c b/src/dbusbind.c index bf19605a346..7bb4e551da5 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -936,7 +936,7 @@ DEFUN ("dbus-init-bus", Fdbus_init_bus, Sdbus_init_bus, 1, 1, 0, | |||
| 936 | Vdbus_registered_buses = Fcons (bus, Vdbus_registered_buses); | 936 | Vdbus_registered_buses = Fcons (bus, Vdbus_registered_buses); |
| 937 | 937 | ||
| 938 | /* We do not want to abort. */ | 938 | /* We do not want to abort. */ |
| 939 | putenv ("DBUS_FATAL_WARNINGS=0"); | 939 | putenv ((char *) "DBUS_FATAL_WARNINGS=0"); |
| 940 | 940 | ||
| 941 | /* Return. */ | 941 | /* Return. */ |
| 942 | return Qnil; | 942 | return Qnil; |