Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/xftFontLoader.C b/src/frontends/gtk/xftFontLoader.C
index e2e495b1fa92844094d2736bb5dd85e9ed8da2ce..408a46398b3667fe8b8cfdfcf10d0246b6b209a0 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.C
+++ b/src/frontends/gtk/xftFontLoader.C
@@ -10,7 +10,11 @@
 
 #include <config.h>
 
-#include <gtkmm.h>
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "xftFontLoader.h"
 #include "FontInfo.h"
 #include "gettext.h"
@@ -25,9 +29,6 @@
 #include "support/systemcall.h"
 #include "support/filetools.h"
 
-
-#include <X11/Xft/Xft.h>
-
 #include <cmath>       // fabs()
 #include <vector>