From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Jul 2013 18:35:01 +0000 (-0700)
Subject: regex: port to --with-included-regex --enable-gcc-warnings non-threaded
X-Git-Tag: v0.1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da8d59ee79138b85daee1ad5b22ea12e4fb6ce47;p=thirdparty%2Fgnulib.git

regex: port to --with-included-regex --enable-gcc-warnings non-threaded

* lib/regex_internal.h (lock_fini, lock_lock): Rework to avoid
gcc warnings in the non-threaded case.  Reported by Charlie Brown in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-07/msg00015.html>.
---

diff --git a/ChangeLog b/ChangeLog
index 484484af92..4d73a269c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-07-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+	regex: port to --with-included-regex --enable-gcc-warnings non-threaded
+	* lib/regex_internal.h (lock_fini, lock_lock): Rework to avoid
+	gcc warnings in the non-threaded case.  Reported by Charlie Brown in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-07/msg00015.html>.
+
 	accept4, dup3, pipe2: port to Cygwin
 	Problem reported for Emacs by Ken Brown in <http://bugs.gnu.org/14821>.
 	* lib/accept4.c (accept4) [O_BINARY]:
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index c92fb1a385..0d19f3511e 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -72,8 +72,9 @@
 #else
 # define lock_define(name)
 # define lock_init(lock) 0
-# define lock_fini(lock) 0
-# define lock_lock(lock) ((void) 0)
+# define lock_fini(lock) ((void) 0)
+  /* The 'dfa' avoids an "unused variable 'dfa'" warning from GCC.  */
+# define lock_lock(lock) ((void) dfa)
 # define lock_unlock(lock) ((void) 0)
 #endif