summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/dbusbind.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b062bfdf06..8a053f05c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,9 @@
(Fdbus_send_signal, xd_read_message_1, Fdbus_register_service):
(Fdbus_register_signal): Use SSDATA when the context wants char *.
+ * dbusbind.c (Fdbus_init_bus): Add cast to avoid warning
+ if GCC considers string literals to be constants.
+
2011-03-13 Chong Yidong <cyd@stupidchicken.com>
* 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 bf19605a34..7bb4e551da 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,
Vdbus_registered_buses = Fcons (bus, Vdbus_registered_buses);
/* We do not want to abort. */
- putenv ("DBUS_FATAL_WARNINGS=0");
+ putenv ((char *) "DBUS_FATAL_WARNINGS=0");
/* Return. */
return Qnil;