Merge from origin/emacs-25

[gnu-emacs] / src / alloc.c

diff --git a/src/alloc.c b/src/alloc.c
index 1e4ec8b0573a0c89bcbaaf13a7c0736fd6f23e62..56a535411c8318a77ae67bbee7cd9dd483e8dd32 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3724,7 +3724,6 @@ make_save_ptr_int (void *a, ptrdiff_t b)
   return val;
 }
 
-#if ! (defined USE_X_TOOLKIT || defined USE_GTK)
 Lisp_Object
 make_save_ptr_ptr (void *a, void *b)
 {
@@ -3735,7 +3734,6 @@ make_save_ptr_ptr (void *a, void *b)
   p->data[1].pointer = b;
   return val;
 }
-#endif
 
 Lisp_Object
 make_save_funcptr_ptr_obj (void (*a) (void), void *b, Lisp_Object c)