diff options
| author | Ken Brown <kbrown@cornell.edu> | 2016-06-11 08:31:27 -0400 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2016-06-11 08:31:27 -0400 |
| commit | 6921f4a5961fb53f8fb24d1a5a3f94266f990f6e (patch) | |
| tree | 08fbf21746611d578a99e7260f2ad6f8f96fe698 /src/dbusbind.c | |
| parent | e18ee60b02d08b2f075903005798d3d6064dc013 (diff) | |
| download | emacs-6921f4a5961fb53f8fb24d1a5a3f94266f990f6e.tar.gz emacs-6921f4a5961fb53f8fb24d1a5a3f94266f990f6e.tar.bz2 emacs-6921f4a5961fb53f8fb24d1a5a3f94266f990f6e.zip | |
Fix dbus crash on 32-bit Cygwin
* src/dbusbind.c (Fdbus__init_bus): Use make_save_pointer to store
connection address. (Bug#23741)
(xd_lisp_dbus_to_dbus): Use XSAVE_POINTER to retrieve connection
address.
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 d3a32c00341..56bfd7164a4 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -943,7 +943,7 @@ xd_get_connection_references (DBusConnection *connection) static DBusConnection* xd_lisp_dbus_to_dbus (Lisp_Object bus) { - return (DBusConnection *) (intptr_t) XFASTINT (bus); + return (DBusConnection *) XSAVE_POINTER (bus, 0); } /* Return D-Bus connection address. BUS is either a Lisp symbol, @@ -1187,7 +1187,7 @@ this connection to those buses. */) XD_SIGNAL1 (build_string ("Cannot add watch functions")); /* Add bus to list of registered buses. */ - XSETFASTINT (val, (intptr_t) connection); + val = make_save_ptr (connection); xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses); /* Cleanup. */ |