From dbb91b02899ca04059679b24dbaa6a7a2ff2ea0f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 29 Jul 2006 00:03:36 +0000 Subject: [PATCH] * regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89 macro expansion. --- lib/ChangeLog | 5 +++++ lib/regex_internal.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 5b3e242826..a7dc9e839a 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-07-28 Eric Blake + + * regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89 + macro expansion. + 2006-07-28 Simon Josefsson * 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 993c9923e3..06f89a47fe 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -49,7 +49,6 @@ #if defined _LIBC # include #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)) -- 2.30.2