diff options
| author | Paul Eggert | 2011-03-16 19:11:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-16 19:11:29 -0700 |
| commit | 7914961cd705c8a88734ff87c581924bf48c3fe3 (patch) | |
| tree | c710dace8073f85cf19abb4fae9b8d74a4e7bfb3 /src | |
| parent | 73366a004b663bed19b9bc9b83e8843c836db83f (diff) | |
| download | emacs-7914961cd705c8a88734ff87c581924bf48c3fe3.tar.gz emacs-7914961cd705c8a88734ff87c581924bf48c3fe3.zip | |
* bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else".
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/bytecode.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5abc9b66475..9dcab33fed5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-03-17 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else". | ||
| 4 | |||
| 3 | * unexelf.c (unexec): Name an expression, | 5 | * unexelf.c (unexec): Name an expression, |
| 4 | to avoid gcc -Wbad-function-cast warning. | 6 | to avoid gcc -Wbad-function-cast warning. |
| 5 | Use a different way to cause a compilation error if anyone uses | 7 | 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) | |||
| 363 | We do this at every branch, to avoid loops that never GC. */ | 363 | We do this at every branch, to avoid loops that never GC. */ |
| 364 | 364 | ||
| 365 | #define MAYBE_GC() \ | 365 | #define MAYBE_GC() \ |
| 366 | do { \ | ||
| 366 | if (consing_since_gc > gc_cons_threshold \ | 367 | if (consing_since_gc > gc_cons_threshold \ |
| 367 | && consing_since_gc > gc_relative_threshold) \ | 368 | && consing_since_gc > gc_relative_threshold) \ |
| 368 | { \ | 369 | { \ |
| @@ -370,7 +371,7 @@ unmark_byte_stack (void) | |||
| 370 | Fgarbage_collect (); \ | 371 | Fgarbage_collect (); \ |
| 371 | AFTER_POTENTIAL_GC (); \ | 372 | AFTER_POTENTIAL_GC (); \ |
| 372 | } \ | 373 | } \ |
| 373 | else | 374 | } while (0) |
| 374 | 375 | ||
| 375 | /* Check for jumping out of range. */ | 376 | /* Check for jumping out of range. */ |
| 376 | 377 | ||