Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / libs / gtkutil / glfont.cpp

diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp
index 09211a05450d3bd103dfb691ff8e6bfb9b04dde2..afe8546e7c8dd00305c8b0b43935c875fedf7687 100644 (file)
--- a/libs/gtkutil/glfont.cpp
+++ b/libs/gtkutil/glfont.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "glfont.h"
+#include "globaldefs.h"
 #include "igl.h"
 
 // generic string printing with call lists
@@ -50,7 +51,7 @@ virtual int getPixelHeight() const {
 }
 };
 
-#ifdef _WIN32
+#if GDEF_OS_WINDOWS
        #include <windows.h>
 #endif
 #include "debugging/debugging.h"
@@ -174,6 +175,7 @@ GLFont *glfont_create( const char* font_string ){
 // new font code ripped from ZeroRadiant
 
 #include <pango/pangoft2.h>
+#include <pango/pango-features.h>
 #include <pango/pango-utils.h>
 
 class GLFontInternal : public GLFont