X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fregex_internal.h;h=0270cbf408e61b59be23b9c58e631ddd64d1c075;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=c92fb1a385a0cee4d0211e723726ade17321e6bc;hpb=96a263f7953ec80851c81f3a1f40127600b7ea7b;p=gnulib.git

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index c92fb1a38..0270cbf40 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
 
@@ -109,7 +110,7 @@
 # define gettext_noop(String) String
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC
 # define RE_ENABLE_I18N
 #endif