From: Bruno Haible <bruno@clisp.org>
Date: Thu, 14 Aug 2008 09:04:24 +0000 (+0000)
Subject: Update includes after gnulib change.
X-Git-Tag: v0.18~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae296eb308359c65e07879f56f0fa64744731999;p=thirdparty%2Fgettext.git

Update includes after gnulib change.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c7e1aef1e..97607c26a 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-14  Bruno Haible  <bruno@clisp.org>
+
+	* msgmerge.c: Include "glthread/lock.h" instead of "lock.h".
+
 2008-08-03  Bruno Haible  <bruno@clisp.org>
 
 	* x-python.c (mixed_string_buffer_append): Replace a lone high
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 2ed6afccd..62736e9d7 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -54,7 +54,7 @@
 #include "msgl-iconv.h"
 #include "msgl-equal.h"
 #include "msgl-fsearch.h"
-#include "lock.h"
+#include "glthread/lock.h"
 #include "lang-table.h"
 #include "plural-exp.h"
 #include "plural-count.h"