2 files changed, 9 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f95c1594ef..ccd5e1ffa6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2014-09-24  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Default to stack objects on non-GNU/Linux, non-DOS_NT platforms.
+        * lisp.h (USE_STACK_LISP_OBJECTS): Also default to true
+        if !defined DOS_NT && !defined GNU_LINUX.  I've tested this on AIX
+        and Solaris and it's likely to work on similar platforms.
+
         Avoid signed integer overflow when converting Time to ptrdiff_t.
         * keyboard.c (INPUT_EVENT_POS_MAX, INPUT_EVENT_POS_MIN):
         New macros.
diff --git a/src/lisp.h b/src/lisp.h
index 1fc18d5d737..dae8123de5c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -282,13 +282,12 @@ error !;
 # endif
 #endif
 
-/* This should work on GNU/Linux with GCC.  Other configurations may be
-   problematic and/or not tested yet.  Clang is known to have problems,
-   see http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00506.html.
+/* This should work with GCC on non-DOS_NT.  Clang has known problems; see
+   http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00506.html.
    Also http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00422.html
-   describes an issues with 32-bit MS-Windows.  */
+   describes an issue with 32-bit MS-Windows.  */
 #ifndef USE_STACK_LISP_OBJECTS
-# if defined (GNU_LINUX) && defined (__GNUC__) && !defined (__clang__)
+# if defined __GNUC__ && !defined __clang__ && !defined DOS_NT
 #  define USE_STACK_LISP_OBJECTS true
 # else
 #  define USE_STACK_LISP_OBJECTS false