Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / xftFontMetrics.C

diff --git a/src/frontends/gtk/xftFontMetrics.C b/src/frontends/gtk/xftFontMetrics.C
index 91c36dfd61c54929a7ceb4482602ded5e488392f..09d76a80e4b620579636efcdbe9eb29e0268aca2 100644 (file)
--- a/src/frontends/gtk/xftFontMetrics.C
+++ b/src/frontends/gtk/xftFontMetrics.C
@@ -10,8 +10,12 @@
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "GtkmmX.h"
-#include "support/lstrings.h"
 #include "xftFontLoader.h"
 #include "font_metrics.h"
 #include "lyxrc.h"
@@ -19,6 +23,8 @@
 #include "language.h"
 #include "codeConvert.h"
 
+#include "support/lstrings.h"
+
 #include <gtkmm.h>
 
 #include <boost/scoped_array.hpp>