From: Paul Eggert Date: Thu, 17 Mar 2011 02:11:29 +0000 (-0700) Subject: * bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else". X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7914961cd705c8a88734ff87c581924bf48c3fe3;p=emacs.git * bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else". --- diff --git a/src/ChangeLog b/src/ChangeLog index 5abc9b66475..9dcab33fed5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-03-17 Paul Eggert + * bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else". + * unexelf.c (unexec): Name an expression, to avoid gcc -Wbad-function-cast warning. Use a different way to cause a compilation error if anyone uses diff --git a/src/bytecode.c b/src/bytecode.c index bb4e87c019d..fca8a8e1ebe 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -363,6 +363,7 @@ unmark_byte_stack (void) We do this at every branch, to avoid loops that never GC. */ #define MAYBE_GC() \ + do { \ if (consing_since_gc > gc_cons_threshold \ && consing_since_gc > gc_relative_threshold) \ { \ @@ -370,7 +371,7 @@ unmark_byte_stack (void) Fgarbage_collect (); \ AFTER_POTENTIAL_GC (); \ } \ - else + } while (0) /* Check for jumping out of range. */