From 9cb4d8b6372f0aa856e87be4ce585d12b97dedee Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Mon, 23 Sep 2013 16:44:23 +0800
Subject: [PATCH] fix build

---
 3rdparty/poppler/0.22.5/CairoFontEngine.cc | 3 +--
 3rdparty/poppler/0.22.5/CairoOutputDev.cc  | 4 ++--
 3rdparty/poppler/0.22.5/CairoRescaleBox.cc | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/3rdparty/poppler/0.22.5/CairoFontEngine.cc b/3rdparty/poppler/0.22.5/CairoFontEngine.cc
index c4493e8..92f2486 100644
--- a/3rdparty/poppler/0.22.5/CairoFontEngine.cc
+++ b/3rdparty/poppler/0.22.5/CairoFontEngine.cc
@@ -32,9 +32,8 @@
 //
 //========================================================================
 
-#include <config.h>
+#include <poppler-config.h>
 
-#include "config.h"
 #include <string.h>
 #include "CairoFontEngine.h"
 #include "CairoOutputDev.h"
diff --git a/3rdparty/poppler/0.22.5/CairoOutputDev.cc b/3rdparty/poppler/0.22.5/CairoOutputDev.cc
index 34d5a70..5a62fe2 100644
--- a/3rdparty/poppler/0.22.5/CairoOutputDev.cc
+++ b/3rdparty/poppler/0.22.5/CairoOutputDev.cc
@@ -34,7 +34,7 @@
 //
 //========================================================================
 
-#include <config.h>
+#include <poppler-config.h>
 
 #ifdef USE_GCC_PRAGMAS
 #pragma implementation
@@ -44,9 +44,9 @@
 #include <math.h>
 #include <assert.h>
 #include <cairo.h>
+#include <stdint.h>
 
 #include "goo/gfile.h"
-#include "goo/gtypes_p.h"
 #include "GlobalParams.h"
 #include "Error.h"
 #include "Object.h"
diff --git a/3rdparty/poppler/0.22.5/CairoRescaleBox.cc b/3rdparty/poppler/0.22.5/CairoRescaleBox.cc
index 3c96f45..3d19689 100644
--- a/3rdparty/poppler/0.22.5/CairoRescaleBox.cc
+++ b/3rdparty/poppler/0.22.5/CairoRescaleBox.cc
@@ -51,7 +51,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include "goo/gmem.h"
-#include "goo/gtypes_p.h"
 #include "CairoRescaleBox.h"