aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regex_internal.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ef990c0..c0074c3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-05 Arnold D. Robbins <arnold@skeeve.com>
+
+ * regex_internal.h (struct re_dfa_t): Restore ifdefs around
+ __libc_lock_define, they really were needed. Bleah.
+
2013-01-01 Arnold D. Robbins <arnold@skeeve.com>
Sync with GLIBC regex files.
diff --git a/regex_internal.h b/regex_internal.h
index 18050898..f38a13b0 100644
--- a/regex_internal.h
+++ b/regex_internal.h
@@ -692,7 +692,9 @@ struct re_dfa_t
#ifdef DEBUG
char* re_str;
#endif
+#if defined _LIBC
__libc_lock_define (, lock)
+#endif
};
#define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))