diff options
| author | Dmitry Gutov | 2019-05-24 04:53:39 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2019-05-24 04:53:39 +0300 |
| commit | 8cdb9d9d24be0894ec3adc79f7f4af61e131850e (patch) | |
| tree | 05cfdc9237eaf1abe30911caca26e95e2c68f4bd /src/alloc.c | |
| parent | 62349fe82ad42d7d2a7fb19e40860ee5d6ebd017 (diff) | |
| parent | 5b6401b001c770f5426597175a90ba78ddca79ef (diff) | |
| download | emacs-8cdb9d9d24be0894ec3adc79f7f4af61e131850e.tar.gz emacs-8cdb9d9d24be0894ec3adc79f7f4af61e131850e.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index af4adb3856e..5c5b56d02e9 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6384,7 +6384,7 @@ mark_object (Lisp_Object arg) | |||
| 6384 | do { \ | 6384 | do { \ |
| 6385 | CHECK_ALLOCATED (); \ | 6385 | CHECK_ALLOCATED (); \ |
| 6386 | CHECK_LIVE (LIVEP); \ | 6386 | CHECK_LIVE (LIVEP); \ |
| 6387 | } while (0) \ | 6387 | } while (false) |
| 6388 | 6388 | ||
| 6389 | /* Check both of the above conditions, for symbols. */ | 6389 | /* Check both of the above conditions, for symbols. */ |
| 6390 | #define CHECK_ALLOCATED_AND_LIVE_SYMBOL() \ | 6390 | #define CHECK_ALLOCATED_AND_LIVE_SYMBOL() \ |
| @@ -6394,7 +6394,7 @@ mark_object (Lisp_Object arg) | |||
| 6394 | CHECK_ALLOCATED (); \ | 6394 | CHECK_ALLOCATED (); \ |
| 6395 | CHECK_LIVE (live_symbol_p); \ | 6395 | CHECK_LIVE (live_symbol_p); \ |
| 6396 | } \ | 6396 | } \ |
| 6397 | } while (0) \ | 6397 | } while (false) |
| 6398 | 6398 | ||
| 6399 | #else /* not GC_CHECK_MARKED_OBJECTS */ | 6399 | #else /* not GC_CHECK_MARKED_OBJECTS */ |
| 6400 | 6400 | ||