diff options
| author | Alan Mackenzie | 2016-03-30 16:53:36 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2016-03-30 16:53:36 +0000 |
| commit | ed19f207449c43f7f08285ada87ae7a46c61c8d1 (patch) | |
| tree | fc495d64b752f276f1e8dc86427098de80789988 /src/alloc.c | |
| parent | eabd667a9584fe5bd2422e296d256dceea67debf (diff) | |
| parent | 7c1802f6ffc2704ba8042c7c1c6faa73dfa210d1 (diff) | |
| download | emacs-ed19f207449c43f7f08285ada87ae7a46c61c8d1.tar.gz emacs-ed19f207449c43f7f08285ada87ae7a46c61c8d1.zip | |
Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25
Diffstat (limited to 'src/alloc.c')
| -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) |