Imported Debian patch 2.12.3-1

[lilypond.git] / lily / source-file.cc

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 90bc5fcabde4a01ecfd8d0e6a55e09d8aa1621f5..d5e4bcf6764a015a6adc6b6725939407e821bde1 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -3,19 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "source-file.hh"
+#if GCC_MAJOR < 4
+#define _GLIBCXX_HAVE_MBSTATE_T
+#include <wchar.h>
+#endif /* GCC_MAJOR < 4 */
 
+#include "source-file.hh"
+#include <cstring>
 #include "config.hh"
 
 #if HAVE_UTF8_WCHAR_H
 #include <utf8/wchar.h>  /* mbrtowc */
-#else
+#else /* !HAVE_UTF8_WCHAR_H */
 #include <cwchar> /* mbrtowc */
-#endif
+#endif /* HAVE_UTF8_WCHAR_H */
 
 #include <cstdio>