[poppler] glib/poppler-document.cc glib/poppler-page.cc glib/poppler-private.h

[Carlos Garcia Campos]

 glib/poppler-document.cc |    2 ++
 glib/poppler-page.cc     |    2 ++
 glib/poppler-private.h   |    3 +++
 3 files changed, 7 insertions(+)

New commits:
commit ff88abf61f4bf90ad276a8593be1818d39c8ecac
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Mon Sep 13 10:05:45 2010 +0200

    [glib] Avoid core headers to be parsed by the g-i scanner

diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 2762881..78c739d 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -18,6 +18,7 @@
 
 #include <string.h>
 
+#ifndef __GI_SCANNER__
 #include <goo/GooList.h>
 #include <splash/SplashBitmap.h>
 #include <GlobalParams.h>
@@ -31,6 +32,7 @@
 #include <FontInfo.h>
 #include <PDFDocEncoding.h>
 #include <OptionalContent.h>
+#endif
 
 #include "poppler.h"
 #include "poppler-private.h"
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index bc95e65..60d311d 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -19,6 +19,7 @@
 #include "config.h"
 #include <math.h>
 
+#ifndef __GI_SCANNER__
 #include <goo/GooList.h>
 #include <GlobalParams.h>
 #include <PDFDoc.h>
@@ -27,6 +28,7 @@
 #include <UnicodeMap.h>
 #include <GfxState.h>
 #include <PageTransition.h>
+#endif
 
 #include "poppler.h"
 #include "poppler-private.h"
diff --git a/glib/poppler-private.h b/glib/poppler-private.h
index d5b5b3e..f939fa5 100644
--- a/glib/poppler-private.h
+++ b/glib/poppler-private.h
@@ -2,6 +2,8 @@
 #define __POPPLER_PRIVATE_H__
 
 #include <config.h>
+
+#ifndef __GI_SCANNER__
 #include <PDFDoc.h>
 #include <PSOutputDev.h>
 #include <Link.h>
@@ -14,6 +16,7 @@
 #include <Catalog.h>
 #include <OptionalContent.h>
 #include <CairoOutputDev.h>
+#endif
 
 struct _PopplerDocument
 {