[poppler] Branch 'poppler-0.20' - goo/FixedPoint.h goo/gfile.h goo/gmem.h goo/GooTimer.h goo/JpegWriter.h goo/PNGWriter.h goo/TiffWriter.h splash/SplashFTFont.h splash/SplashMath.h

[Albert Astals Cid]

 goo/FixedPoint.h      |    2 +-
 goo/GooTimer.h        |    2 +-
 goo/JpegWriter.h      |    2 +-
 goo/PNGWriter.h       |    2 +-
 goo/TiffWriter.h      |    2 +-
 goo/gfile.h           |    2 +-
 goo/gmem.h            |    2 +-
 splash/SplashFTFont.h |    2 +-
 splash/SplashMath.h   |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 349b21acc249c130fb053bc4a0c75019f75bd35b
Author: Torsten Kasch <tk at CeBiTec.Uni-Bielefeld.DE>
Date:   Thu Jul 19 00:18:14 2012 +0200

    Unify poppler-config.h includes in core "installed" headers
    
    Bug 52193

diff --git a/goo/FixedPoint.h b/goo/FixedPoint.h
index afe21d9..9974980 100644
--- a/goo/FixedPoint.h
+++ b/goo/FixedPoint.h
@@ -11,7 +11,7 @@
 #ifndef FIXEDPOINT_H
 #define FIXEDPOINT_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #if USE_FIXEDPOINT
 
diff --git a/goo/GooTimer.h b/goo/GooTimer.h
index d700e50..d77373e 100755
--- a/goo/GooTimer.h
+++ b/goo/GooTimer.h
@@ -19,7 +19,7 @@
 #pragma interface
 #endif
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 #include "gtypes.h"
 #ifdef HAVE_GETTIMEOFDAY
 #include <sys/time.h>
diff --git a/goo/JpegWriter.h b/goo/JpegWriter.h
index 7af6870..d076224 100644
--- a/goo/JpegWriter.h
+++ b/goo/JpegWriter.h
@@ -17,7 +17,7 @@
 #ifndef JPEGWRITER_H
 #define JPEGWRITER_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #ifdef ENABLE_LIBJPEG
 
diff --git a/goo/PNGWriter.h b/goo/PNGWriter.h
index f22495d..9e412b4 100644
--- a/goo/PNGWriter.h
+++ b/goo/PNGWriter.h
@@ -15,7 +15,7 @@
 #ifndef PNGWRITER_H
 #define PNGWRITER_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #ifdef ENABLE_LIBPNG
 
diff --git a/goo/TiffWriter.h b/goo/TiffWriter.h
index b2b0ea9..1f4b5eb 100644
--- a/goo/TiffWriter.h
+++ b/goo/TiffWriter.h
@@ -12,7 +12,7 @@
 #ifndef TIFFWRITER_H
 #define TIFFWRITER_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #ifdef ENABLE_LIBTIFF
 
diff --git a/goo/gfile.h b/goo/gfile.h
index d4b9082..46b8958 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -27,7 +27,7 @@
 #ifndef GFILE_H
 #define GFILE_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/goo/gmem.h b/goo/gmem.h
index d5bb2ae..898f339 100644
--- a/goo/gmem.h
+++ b/goo/gmem.h
@@ -26,7 +26,7 @@
 #define GMEM_H
 
 #include <stdio.h>
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/splash/SplashFTFont.h b/splash/SplashFTFont.h
index f49d7b1..98cb29d 100644
--- a/splash/SplashFTFont.h
+++ b/splash/SplashFTFont.h
@@ -23,7 +23,7 @@
 #ifndef SPLASHFTFONT_H
 #define SPLASHFTFONT_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 
diff --git a/splash/SplashMath.h b/splash/SplashMath.h
index 1886dec..ca73c2b 100644
--- a/splash/SplashMath.h
+++ b/splash/SplashMath.h
@@ -21,7 +21,7 @@
 #ifndef SPLASHMATH_H
 #define SPLASHMATH_H
 
-#include "poppler/poppler-config.h"
+#include "poppler-config.h"
 
 #if USE_FIXEDPOINT
 #include "goo/FixedPoint.h"