summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog7
-rw-r--r--src/alloc.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d0d54233da7..9b19ce7b96a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-02 Paul Eggert <eggert@cs.ucla.edu>
+
+ * alloc.c (mark_object): Remove "#ifdef GC_CHECK_MARKED_OBJECTS"
+ wrapper that is not needed because the wrapped code is a no-op (zero
+ machine instructions) when GC_CHECK_MARKED_OBJECTS is not defined.
+ This avoids a -Wunused-macros diagnostic with GCC 4.7.1 x86-64.
+
2012-07-02 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c (mark_buffer): Simplify. Remove prototype.
diff --git a/src/alloc.c b/src/alloc.c
index b059d6c04a6..b0945aa30de 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5924,10 +5924,8 @@ mark_object (Lisp_Object arg)
else
pvectype = 0;
-#ifdef GC_CHECK_MARKED_OBJECTS
if (pvectype != PVEC_SUBR && pvectype != PVEC_BUFFER)
CHECK_LIVE (live_vector_p);
-#endif /* GC_CHECK_MARKED_OBJECTS */
if (pvectype == PVEC_BUFFER)
{