From d8401629f49fed515e7cab4cbb3a04d820969c1c Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri, 1 Aug 2014 07:34:42 +0530
Subject: [PATCH] Use consistent style to check DEBUG macro in regex_internal.c

The DEBUG macro is checked using both #if and #ifdef in
regex_internal.c.  Make this consistent with mktime, where we use "#if
defined DEBUG && DEBUG", to be compatible with gnulib as well as glibc
style.

        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.
---
 ChangeLog            | 7 +++++++
 lib/regex_internal.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fbf438015..59ce3dcca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
-- 
2.39.5