From: Eric Blake <ebb9@byu.net>
Date: Sat, 29 Jul 2006 00:03:36 +0000 (+0000)
Subject: * regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89
X-Git-Tag: cvs-readonly~2120
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=dbb91b02899ca04059679b24dbaa6a7a2ff2ea0f;p=gnulib.git

* regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89
macro expansion.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5b3e24282..a7dc9e839 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-28  Eric Blake  <ebb9@byu.net>
+
+	* regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89
+	macro expansion.
+
 2006-07-28  Simon Josefsson  <jas@extundo.com>
 
 	* inet_ntop.h, inet_pton.h: No need to guard netinet/in.h
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 993c9923e..06f89a47f 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -49,7 +49,6 @@
 #if defined _LIBC
 # include <bits/libc-lock.h>
 #else
-# define __libc_lock_define(CLASS,NAME)
 # define __libc_lock_init(NAME) do { } while (0)
 # define __libc_lock_lock(NAME) do { } while (0)
 # define __libc_lock_unlock(NAME) do { } while (0)
@@ -711,7 +710,9 @@ struct re_dfa_t
 #ifdef DEBUG
   char* re_str;
 #endif
+#ifdef _LIBC
   __libc_lock_define (, lock)
+#endif
 };
 
 #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))