[poppler] goo/gtypes.h goo/gtypes_p.h goo/Makefile.am poppler/CairoOutputDev.cc poppler/CairoRescaleBox.cc utils/pdftocairo.cc

[Albert Astals Cid]

 goo/Makefile.am            |    1 +
 goo/gtypes.h               |   18 ------------------
 goo/gtypes_p.h             |   30 ++++++++++++++++++++++++++++++
 poppler/CairoOutputDev.cc  |    1 +
 poppler/CairoRescaleBox.cc |    1 +
 utils/pdftocairo.cc        |    1 +
 6 files changed, 34 insertions(+), 18 deletions(-)

New commits:
commit ade53277546cef4ba19d982518c0cd83a4bb9c12
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Aug 21 23:42:53 2011 +0200

    Move HAVE_STDINT_H use to a private header
    
    This way we do not need to expose it in poppler-config.h since gtypes.h is a half public header

diff --git a/goo/Makefile.am b/goo/Makefile.am
index be791ee..1921b1e 100644
--- a/goo/Makefile.am
+++ b/goo/Makefile.am
@@ -43,4 +43,5 @@ libgoo_la_SOURCES =				\
 	JpegWriter.cc				\
 	TiffWriter.cc				\
 	ImgWriter.cc				\
+	gtypes_p.h				\
 	gstrtod.cc
diff --git a/goo/gtypes.h b/goo/gtypes.h
index cb1cb89..b7a2dd2 100644
--- a/goo/gtypes.h
+++ b/goo/gtypes.h
@@ -24,8 +24,6 @@
 #ifndef GTYPES_H
 #define GTYPES_H
 
-#include "config.h"
-
 /*
  * These have stupid names to avoid conflicts with some (but not all)
  * C++ compilers which define them.
@@ -47,20 +45,4 @@ typedef unsigned short Gushort;
 typedef unsigned int Guint;
 typedef unsigned long Gulong;
 
-/*
- * Define precise integer types.
- */
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif _MSC_VER
-typedef signed   __int8  int8_t;
-typedef unsigned __int8  uint8_t;
-typedef signed   __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef signed   __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef signed   __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#endif
-
 #endif
diff --git a/goo/gtypes_p.h b/goo/gtypes_p.h
new file mode 100644
index 0000000..d3a3fe4
--- /dev/null
+++ b/goo/gtypes_p.h
@@ -0,0 +1,30 @@
+/*
+ * gtypes_p.h
+ *
+ * Some useful simple types.
+ *
+ * Copyright (C) 2010 Albert Astals Cid <aacid at kde.org>
+ */
+
+#ifndef GTYPES_P_H
+#define GTYPES_P_H
+
+#include "config.h"
+
+/*
+ * Define precise integer types.
+ */
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif _MSC_VER
+typedef signed   __int8  int8_t;
+typedef unsigned __int8  uint8_t;
+typedef signed   __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed   __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed   __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#endif
+
+#endif
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 29d8f95..08c28ec 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -44,6 +44,7 @@
 #include <cairo.h>
 
 #include "goo/gfile.h"
+#include "goo/gtypes_p.h"
 #include "GlobalParams.h"
 #include "Error.h"
 #include "Object.h"
diff --git a/poppler/CairoRescaleBox.cc b/poppler/CairoRescaleBox.cc
index fea5891..234322a 100644
--- a/poppler/CairoRescaleBox.cc
+++ b/poppler/CairoRescaleBox.cc
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "goo/gmem.h"
+#include "goo/gtypes_p.h"
 #include "CairoRescaleBox.h"
 
 
diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
index 193854d..f86b10f 100644
--- a/utils/pdftocairo.cc
+++ b/utils/pdftocairo.cc
@@ -39,6 +39,7 @@
 #include "parseargs.h"
 #include "goo/gmem.h"
 #include "goo/gtypes.h"
+#include "goo/gtypes_p.h"
 #include "goo/GooString.h"
 #include "goo/ImgWriter.h"
 #include "goo/JpegWriter.h"