diff options
| author | Vincent Belaïche | 2016-07-28 18:12:50 +0200 |
|---|---|---|
| committer | Vincent Belaïche | 2016-07-28 18:12:50 +0200 |
| commit | 90ab699c4f281d0c9a9b71f3eb4c8493d00fcf4f (patch) | |
| tree | df3235d89ee8e4d32571b8a8521f75f7576913c2 /src/dbusbind.c | |
| parent | 41b28dea8587c13b0bc59c1ec70b65afab3aeeca (diff) | |
| parent | ec359399a47f852b4d022a30245449438e349193 (diff) | |
| download | emacs-90ab699c4f281d0c9a9b71f3eb4c8493d00fcf4f.tar.gz emacs-90ab699c4f281d0c9a9b71f3eb4c8493d00fcf4f.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 618176dd452..7a94c81eeab 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -943,7 +943,7 @@ xd_get_connection_references (DBusConnection *connection) | |||
| 943 | static DBusConnection* | 943 | static DBusConnection* |
| 944 | xd_lisp_dbus_to_dbus (Lisp_Object bus) | 944 | xd_lisp_dbus_to_dbus (Lisp_Object bus) |
| 945 | { | 945 | { |
| 946 | return (DBusConnection *) (intptr_t) XFASTINT (bus); | 946 | return (DBusConnection *) XSAVE_POINTER (bus, 0); |
| 947 | } | 947 | } |
| 948 | 948 | ||
| 949 | /* Return D-Bus connection address. BUS is either a Lisp symbol, | 949 | /* Return D-Bus connection address. BUS is either a Lisp symbol, |
| @@ -1186,7 +1186,7 @@ this connection to those buses. */) | |||
| 1186 | XD_SIGNAL1 (build_string ("Cannot add watch functions")); | 1186 | XD_SIGNAL1 (build_string ("Cannot add watch functions")); |
| 1187 | 1187 | ||
| 1188 | /* Add bus to list of registered buses. */ | 1188 | /* Add bus to list of registered buses. */ |
| 1189 | XSETFASTINT (val, (intptr_t) connection); | 1189 | val = make_save_ptr (connection); |
| 1190 | xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses); | 1190 | xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses); |
| 1191 | 1191 | ||
| 1192 | /* Cleanup. */ | 1192 | /* Cleanup. */ |