diff options
| author | Paul Eggert | 2012-07-02 00:36:17 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-02 00:36:17 -0700 |
| commit | 3b3e4caca71abc2df49f95090aaccb96cbb75a41 (patch) | |
| tree | cfe1dedde87ca97bf6583e6f3243f1d8dd6b7fdc /src | |
| parent | cf5c017598d130e76e96c47045372ba4a9ad6404 (diff) | |
| download | emacs-3b3e4caca71abc2df49f95090aaccb96cbb75a41.tar.gz emacs-3b3e4caca71abc2df49f95090aaccb96cbb75a41.zip | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
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 @@ | |||
| 1 | 2012-07-02 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * alloc.c (mark_object): Remove "#ifdef GC_CHECK_MARKED_OBJECTS" | ||
| 4 | wrapper that is not needed because the wrapped code is a no-op (zero | ||
| 5 | machine instructions) when GC_CHECK_MARKED_OBJECTS is not defined. | ||
| 6 | This avoids a -Wunused-macros diagnostic with GCC 4.7.1 x86-64. | ||
| 7 | |||
| 1 | 2012-07-02 Dmitry Antipov <dmantipov@yandex.ru> | 8 | 2012-07-02 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 9 | ||
| 3 | * alloc.c (mark_buffer): Simplify. Remove prototype. | 10 | * 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) | |||
| 5924 | else | 5924 | else |
| 5925 | pvectype = 0; | 5925 | pvectype = 0; |
| 5926 | 5926 | ||
| 5927 | #ifdef GC_CHECK_MARKED_OBJECTS | ||
| 5928 | if (pvectype != PVEC_SUBR && pvectype != PVEC_BUFFER) | 5927 | if (pvectype != PVEC_SUBR && pvectype != PVEC_BUFFER) |
| 5929 | CHECK_LIVE (live_vector_p); | 5928 | CHECK_LIVE (live_vector_p); |
| 5930 | #endif /* GC_CHECK_MARKED_OBJECTS */ | ||
| 5931 | 5929 | ||
| 5932 | if (pvectype == PVEC_BUFFER) | 5930 | if (pvectype == PVEC_BUFFER) |
| 5933 | { | 5931 | { |