aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown2013-07-24 11:11:30 -0400
committerKen Brown2013-07-24 11:11:30 -0400
commit198fa217564af28aa5075e80f2fc089a221e69d7 (patch)
treef3a198ffc0d269b17299b4158ed19bf12918270f
parente81dd54dc2ac22d2ea2e2c6e8c79497d074e2458 (diff)
downloademacs-198fa217564af28aa5075e80f2fc089a221e69d7.tar.gz
emacs-198fa217564af28aa5075e80f2fc089a221e69d7.zip
* src/alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined (Bug#14944).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 51a5da68877..2f04edc9bec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-07-24 Ken Brown <kbrown@cornell.edu>
2
3 * alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined
4 (Bug#14944).
5
12013-07-24 Paul Eggert <eggert@cs.ucla.edu> 62013-07-24 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * eval.c (Fprogn): Do not check that BODY is a proper list. 8 * eval.c (Fprogn): Do not check that BODY is a proper list.
diff --git a/src/alloc.c b/src/alloc.c
index e6e06794dbc..c8141d22f95 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3371,7 +3371,7 @@ make_save_obj_obj_obj_obj (Lisp_Object a, Lisp_Object b, Lisp_Object c,
3371 return val; 3371 return val;
3372} 3372}
3373 3373
3374#if defined HAVE_NS || defined DOS_NT 3374#if defined HAVE_NS || defined HAVE_NTGUI
3375Lisp_Object 3375Lisp_Object
3376make_save_ptr (void *a) 3376make_save_ptr (void *a)
3377{ 3377{