diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/regex_internal.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2014-08-01 Siddhesh Poyarekar <siddhesh@redhat.com> + + regex: Make #if/#ifdef usage consistent for DEBUG + * lib/regex_internal.c: Use "#if defined DEBUG && DEBUG" instead + of the inconsistent usage of #if and #ifdef as that works with + both Glibc and Gnulib's style. + 2014-07-31 Eric Blake <eblake@redhat.com> openat-die: use _Noreturn markup diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 79181a3314..92d48b5232 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -677,7 +677,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) pstr->valid_len - offset); pstr->valid_len -= offset; pstr->valid_raw_len -= offset; -#if DEBUG +#if defined DEBUG && DEBUG assert (pstr->valid_len > 0); #endif } @@ -936,7 +936,7 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags) Idx wc_idx = idx; while(input->wcs[wc_idx] == WEOF) { -#ifdef DEBUG +#if defined DEBUG && DEBUG /* It must not happen. */ assert (REG_VALID_INDEX (wc_idx)); #endif |