From f59ff6fcc2fc2a2006101838ff0cebd5b32d9886 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 21 Jun 2012 13:47:41 -0400
Subject: fix include order for off_t

---
 libqpdf/qpdf/MD5.hh         | 2 +-
 libqpdf/qpdf/PCRE.hh        | 4 ++--
 libqpdf/qpdf/QPDF_Stream.hh | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'libqpdf')

diff --git a/libqpdf/qpdf/MD5.hh b/libqpdf/qpdf/MD5.hh
index ef454def..4cfe027e 100644
--- a/libqpdf/qpdf/MD5.hh
+++ b/libqpdf/qpdf/MD5.hh
@@ -1,7 +1,6 @@
 #ifndef __MD5_HH__
 #define __MD5_HH__
 
-#include <string>
 #include <qpdf/DLL.h>
 #include <qpdf/qpdf-config.h>
 #ifdef HAVE_INTTYPES_H
@@ -10,6 +9,7 @@
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#include <string>
 
 class MD5
 {
diff --git a/libqpdf/qpdf/PCRE.hh b/libqpdf/qpdf/PCRE.hh
index 5d1ae458..8f200655 100644
--- a/libqpdf/qpdf/PCRE.hh
+++ b/libqpdf/qpdf/PCRE.hh
@@ -5,6 +5,8 @@
 #ifndef __PCRE_HH__
 #define __PCRE_HH__
 
+#include <qpdf/DLL.h>
+
 #ifdef _WIN32
 # define PCRE_STATIC
 #endif
@@ -12,8 +14,6 @@
 #include <string>
 #include <stdexcept>
 
-#include <qpdf/DLL.h>
-
 // Note: this class does not encapsulate all features of the PCRE
 // package -- only those that I actually need right now are here.
 
diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh
index f6886b62..49db4d47 100644
--- a/libqpdf/qpdf/QPDF_Stream.hh
+++ b/libqpdf/qpdf/QPDF_Stream.hh
@@ -1,8 +1,9 @@
 #ifndef __QPDF_STREAM_HH__
 #define __QPDF_STREAM_HH__
 
-#include <qpdf/QPDFObject.hh>
+#include <qpdf/Types.h>
 
+#include <qpdf/QPDFObject.hh>
 #include <qpdf/QPDFObjectHandle.hh>
 
 class Pipeline;
-- 
cgit v1.2.3-54-g00ecf