From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 20 Dec 2005 23:31:01 +0000 (+0000)
Subject: Include libintl.h.  Fixes mingw
X-Git-Tag: release/2.7.25~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4e21cb2b0e2f9e4adbc43db77e527d1ec0c3ec76;p=lilypond.git

Include libintl.h.  Fixes mingw
compile.
---

diff --git a/ChangeLog b/ChangeLog
index 6da5cfe4b7..7bf1e39ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/relocate.cc [HAVE_GETTEXT]: Include libintl.h.  Fixes mingw
+	compile.
+
 2005-12-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* .cvsignore: Add install-sh.
diff --git a/lily/relocate.cc b/lily/relocate.cc
index 7ae2374e45..16a76dfd48 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -9,19 +9,23 @@
 
 #include "relocate.hh"
 
-#include "string.hh"
-#include "file-name.hh"
-#include "file-path.hh"
-#include "main.hh"
-#include "warn.hh"
 #include "config.hh"
-#include "version.hh"
 
+#include <sys/stat.h>
+#include <unistd.h>
+
+#if HAVE_GETTEXT
+#include <libintl.h>
+#endif
+
+#include "file-name.hh"
+#include "file-path.hh"
 #include "lily-guile.hh"
 #include "lily-version.hh"
+#include "main.hh"
+#include "version.hh"
+#include "warn.hh"
 
-#include <unistd.h>
-#include <sys/stat.h>
 
 int
 sane_putenv (char const *key, String value, bool overwrite)