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

macro expansion.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5b3e2428263f7e1476d51c79a019dc456b0194b5..a7dc9e839a11b95820e0a413185a89f923a563e3 100644 (file)
--- 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 993c9923e33181d2196c3c618e468dc9823d1ce5..06f89a47feb973ed81c5d1277c2db67fc92a1c45 100644 (file)
--- 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))