Fix check for unsafe watch descriptor

* src/lisp.h (make_pointer_integer_unsafe): New function.
(make_pointer_integer): Use it.
* src/gfilenotify.c (dir_monitor_callback): Omit redundant eassert.
(Fgfile_add_watch): Signal an error instead of failing an
assertion if the pointer does not work.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/lisp.h b/src/lisp.h
index b7ef8dc63a0..18d53537cca 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1189,9 +1189,15 @@ XFIXNUMPTR (Lisp_Object a)
 }
 
 INLINE Lisp_Object
+make_pointer_integer_unsafe (void *p)
+{
+  return TAG_PTR (Lisp_Int0, p);
+}
+
+INLINE Lisp_Object
 make_pointer_integer (void *p)
 {
-  Lisp_Object a = TAG_PTR (Lisp_Int0, p);
+  Lisp_Object a = make_pointer_integer_unsafe (p);
   eassert (FIXNUMP (a) && XFIXNUMPTR (a) == p);
   return a;
 }