diff options
| author | Eli Zaretskii | 2016-03-24 20:52:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-03-24 20:52:45 +0200 |
| commit | 077b78cffc0711717ae8976ef302b788e88d27a8 (patch) | |
| tree | a9a19941f1cdd09f0030a79645c13965e2942efe /src | |
| parent | 20a1003f6de52d574ea12e72ac5070a3d5e181ab (diff) | |
| download | emacs-077b78cffc0711717ae8976ef302b788e88d27a8.tar.gz emacs-077b78cffc0711717ae8976ef302b788e88d27a8.zip | |
Define make_save_ptr_ptr unconditionally
* src/alloc.c (make_save_ptr_ptr): Remove the !(defined
USE_X_TOOLKIT || defined USE_GTK) conditional. Reported by
Philipp Stephani <phst@google.com>. (Bug#23101)
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index b5be0f6e69c..4c9cbf10724 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -3730,7 +3730,6 @@ make_save_ptr_int (void *a, ptrdiff_t b) | |||
| 3730 | return val; | 3730 | return val; |
| 3731 | } | 3731 | } |
| 3732 | 3732 | ||
| 3733 | #if ! (defined USE_X_TOOLKIT || defined USE_GTK) | ||
| 3734 | Lisp_Object | 3733 | Lisp_Object |
| 3735 | make_save_ptr_ptr (void *a, void *b) | 3734 | make_save_ptr_ptr (void *a, void *b) |
| 3736 | { | 3735 | { |
| @@ -3741,7 +3740,6 @@ make_save_ptr_ptr (void *a, void *b) | |||
| 3741 | p->data[1].pointer = b; | 3740 | p->data[1].pointer = b; |
| 3742 | return val; | 3741 | return val; |
| 3743 | } | 3742 | } |
| 3744 | #endif | ||
| 3745 | 3743 | ||
| 3746 | Lisp_Object | 3744 | Lisp_Object |
| 3747 | make_save_funcptr_ptr_obj (void (*a) (void), void *b, Lisp_Object c) | 3745 | make_save_funcptr_ptr_obj (void (*a) (void), void *b, Lisp_Object c) |