2 files changed, 4 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 47c43f66915..7dfa2f80775 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2014-09-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * alloc.c: Remove now-unnecessary check.
+        Suggested by Dmitry Antipov in:
+        http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00891.html
+
         * xterm.c (x_term_init): Allocate temps on stack, not on heap.
 
         * frame.c (x_set_frame_parameters): Port --enable-gcc-warnings
diff --git a/src/alloc.c b/src/alloc.c
index 93bdd9a2810..f656dc94216 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -69,12 +69,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static bool valgrind_p;
 #endif
 
-#if USE_STACK_LISP_OBJECTS
-# if GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS
-#  error "Stack-allocated Lisp objects are not compatible with GCPROs"
-# endif
-#endif
-
 /* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects.
    Doable only if GC_MARK_STACK.  */
 #if ! GC_MARK_STACK