summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--lib/regex_internal.h9
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c96c282..1f8daef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2007-02-19 Pedro J. Ruiz Lopez <holzplatten@es.gnu.org>
+
+ * Upgraded gnulib.
+ * Upgraded gettext.
+
+ * lib/regex_internal.h: fix warnings about redefined cpp macros.
+
2007-01-19 Jim Meyering <jim@meyering.net>
- Temporary fix simply to avoid the infloop.
+ temporary fix simply to avoid the infloop.
* libidu/scanners.c (get_token_lisp): Disable the code that
treats '[]' as part of a kawa identifier. It could call ungetc
two or three times in a row. One is the maximum.
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index a19c9a7..b7a8d22 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -40,8 +40,17 @@
#if defined _LIBC
# include <bits/libc-lock.h>
#else
+# if defined __libc_lock_init
+# undef __libc_lock_init
+# endif
# define __libc_lock_init(NAME) do { } while (0)
+# if defined __libc_lock_lock
+# undef __libc_lock_lock
+# endif
# define __libc_lock_lock(NAME) do { } while (0)
+# if defined __libc_lock_unlock
+# undef __libc_lock_unlock
+# endif
# define __libc_lock_unlock(NAME) do { } while (0)
#endif