[poppler] poppler/GlobalParams.cc poppler/GlobalParams.h

[Pino Toscano]

 poppler/GlobalParams.cc |    4 ++++
 poppler/GlobalParams.h  |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c804db4d8261274b013f8c340abfc921c77bb3cf
Author: Pino Toscano <pino at kde.org>
Date:   Tue Mar 1 19:22:31 2011 +0100

    move the fontconfig.h inclusion from GlobalParams.h to GlobalParams.cc
    
    this avoids a dependency on the fontconfig headers to the users of the core

diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index e624aee..f4adf83 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -67,6 +67,10 @@
 #include "GlobalParams.h"
 #include "GfxFont.h"
 
+#if WITH_FONTCONFIGURATION_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#endif
+
 #ifdef _WIN32
 #  define strcasecmp stricmp
 #else
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index e14360a..de990a0 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -38,9 +38,6 @@
 #include <assert.h>
 #include "poppler-config.h"
 #include <stdio.h>
-#if WITH_FONTCONFIGURATION_FONTCONFIG
-#include <fontconfig/fontconfig.h>
-#endif
 #include "goo/gtypes.h"
 #include "CharTypes.h"