From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 8 Jan 2015 01:52:30 +0000 (-0800)
Subject: * src/gfilenotify.c (monitor_to_lisp, lisp_to_monitor):
X-Git-Tag: emacs-25.0.90~2605^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad5ac01471b6795a5168b5e6fb7230adb08f3217;p=emacs.git

* src/gfilenotify.c (monitor_to_lisp, lisp_to_monitor):

Port recent fix to !USE_LSB_TAG platforms.
---

diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 88a40d4cbd9..88222b5bf05 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -38,14 +38,13 @@ static Lisp_Object watch_list;
 static Lisp_Object
 monitor_to_lisp (GFileMonitor *monitor)
 {
-  return XIL ((intptr_t) monitor + Lisp_Int0);
+  return XIL (TAG_PTR (Lisp_Int0, monitor));
 }
 
 static GFileMonitor *
 lisp_to_monitor (Lisp_Object watch_descriptor)
 {
-  intptr_t int_monitor = XLI (watch_descriptor) - Lisp_Int0;
-  return (GFileMonitor *) int_monitor;
+  return XUNTAG (watch_descriptor, Lisp_Int0);
 }
 
 /* This is the callback function for arriving signals from