OpenSystemsDevelopment / qpdf

Commit f59ff6fcc2fc2a2006101838ff0cebd5b32d9886

Authored by Jay Berkenbilt
1 parent fbe68d63

fix include order for off_t

Inline Side-by-side
Showing 11 changed files with 23 additions and 15 deletions
include/qpdf/Pl_Count.hh
  View file @f59ff6f
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 // This pipeline is reusable; i.e., it is safe to call write() after 11 // This pipeline is reusable; i.e., it is safe to call write() after
12 // calling finish(). 12 // calling finish().
13 13
14 -#include <qpdf/Pipeline.hh>  
15 #include <qpdf/Types.h> 14 #include <qpdf/Types.h>
  15 +#include <qpdf/Pipeline.hh>
16 16
17 class Pl_Count: public Pipeline 17 class Pl_Count: public Pipeline
18 { 18 {
include/qpdf/QPDF.hh
  View file @f59ff6f
@@ -8,15 +8,15 @@ @@ -8,15 +8,15 @@
8 #ifndef __QPDF_HH__ 8 #ifndef __QPDF_HH__
9 #define __QPDF_HH__ 9 #define __QPDF_HH__
10 10
  11 +#include <qpdf/DLL.h>
  12 +#include <qpdf/Types.h>
  13 +
11 #include <stdio.h> 14 #include <stdio.h>
12 #include <string> 15 #include <string>
13 #include <map> 16 #include <map>
14 #include <list> 17 #include <list>
15 #include <iostream> 18 #include <iostream>
16 19
17 -#include <qpdf/DLL.h>  
18 -#include <qpdf/Types.h>  
19 -  
20 #include <qpdf/QPDFXRefEntry.hh> 20 #include <qpdf/QPDFXRefEntry.hh>
21 #include <qpdf/QPDFObjectHandle.hh> 21 #include <qpdf/QPDFObjectHandle.hh>
22 #include <qpdf/QPDFTokenizer.hh> 22 #include <qpdf/QPDFTokenizer.hh>
include/qpdf/QPDFExc.hh
  View file @f59ff6f
@@ -9,8 +9,9 @@ @@ -9,8 +9,9 @@
9 #define __QPDFEXC_HH__ 9 #define __QPDFEXC_HH__
10 10
11 #include <qpdf/DLL.h> 11 #include <qpdf/DLL.h>
12 -#include <qpdf/Constants.h>  
13 #include <qpdf/Types.h> 12 #include <qpdf/Types.h>
  13 +
  14 +#include <qpdf/Constants.h>
14 #include <stdexcept> 15 #include <stdexcept>
15 16
16 class QPDFExc: public std::runtime_error 17 class QPDFExc: public std::runtime_error
include/qpdf/QPDFObjectHandle.hh
  View file @f59ff6f
@@ -8,14 +8,14 @@ @@ -8,14 +8,14 @@
8 #ifndef __QPDFOBJECTHANDLE_HH__ 8 #ifndef __QPDFOBJECTHANDLE_HH__
9 #define __QPDFOBJECTHANDLE_HH__ 9 #define __QPDFOBJECTHANDLE_HH__
10 10
  11 +#include <qpdf/DLL.h>
  12 +#include <qpdf/Types.h>
  13 +
11 #include <string> 14 #include <string>
12 #include <vector> 15 #include <vector>
13 #include <set> 16 #include <set>
14 #include <map> 17 #include <map>
15 18
16 -#include <qpdf/DLL.h>  
17 -#include <qpdf/Types.h>  
18 -  
19 #include <qpdf/PointerHolder.hh> 19 #include <qpdf/PointerHolder.hh>
20 #include <qpdf/Buffer.hh> 20 #include <qpdf/Buffer.hh>
21 21
include/qpdf/QPDFWriter.hh
  View file @f59ff6f
@@ -12,6 +12,9 @@ @@ -12,6 +12,9 @@
12 #ifndef __QPDFWRITER_HH__ 12 #ifndef __QPDFWRITER_HH__
13 #define __QPDFWRITER_HH__ 13 #define __QPDFWRITER_HH__
14 14
  15 +#include <qpdf/DLL.h>
  16 +#include <qpdf/Types.h>
  17 +
15 #include <stdio.h> 18 #include <stdio.h>
16 #include <string> 19 #include <string>
17 #include <list> 20 #include <list>
@@ -19,9 +22,7 @@ @@ -19,9 +22,7 @@
19 #include <set> 22 #include <set>
20 #include <map> 23 #include <map>
21 24
22 -#include <qpdf/DLL.h>  
23 #include <qpdf/Constants.h> 25 #include <qpdf/Constants.h>
24 -#include <qpdf/Types.h>  
25 26
26 #include <qpdf/QPDFXRefEntry.hh> 27 #include <qpdf/QPDFXRefEntry.hh>
27 28
include/qpdf/QUtil.hh
  View file @f59ff6f
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 10
11 #include <qpdf/DLL.h> 11 #include <qpdf/DLL.h>
12 #include <qpdf/Types.h> 12 #include <qpdf/Types.h>
  13 +
13 #include <string> 14 #include <string>
14 #include <list> 15 #include <list>
15 #include <stdexcept> 16 #include <stdexcept>
include/qpdf/Types.h
  View file @f59ff6f
1 #ifndef __QPDFTYPES_H__ 1 #ifndef __QPDFTYPES_H__
2 #define __QPDFTYPES_H__ 2 #define __QPDFTYPES_H__
3 3
  4 +/* This file must be included before any system files. It should be
  5 + * included right after <qpdf/DLL.h> within the library.
  6 + */
  7 +
4 /* Attempt to provide off_t and size_t on any recent platform. To 8 /* Attempt to provide off_t and size_t on any recent platform. To
5 * make cross compilation easier and to be more portable across 9 * make cross compilation easier and to be more portable across
6 * platforms, QPDF avoids having any public header files use the 10 * platforms, QPDF avoids having any public header files use the
include/qpdf/qpdf-c.h
  View file @f59ff6f
@@ -70,8 +70,8 @@ @@ -70,8 +70,8 @@
70 */ 70 */
71 71
72 #include <qpdf/DLL.h> 72 #include <qpdf/DLL.h>
73 -#include <qpdf/Constants.h>  
74 #include <qpdf/Types.h> 73 #include <qpdf/Types.h>
  74 +#include <qpdf/Constants.h>
75 75
76 #ifdef __cplusplus 76 #ifdef __cplusplus
77 extern "C" { 77 extern "C" {
libqpdf/qpdf/MD5.hh
  View file @f59ff6f
1 #ifndef __MD5_HH__ 1 #ifndef __MD5_HH__
2 #define __MD5_HH__ 2 #define __MD5_HH__
3 3
4 -#include <string>  
5 #include <qpdf/DLL.h> 4 #include <qpdf/DLL.h>
6 #include <qpdf/qpdf-config.h> 5 #include <qpdf/qpdf-config.h>
7 #ifdef HAVE_INTTYPES_H 6 #ifdef HAVE_INTTYPES_H
@@ -10,6 +9,7 @@ @@ -10,6 +9,7 @@
10 #ifdef HAVE_STDINT_H 9 #ifdef HAVE_STDINT_H
11 # include <stdint.h> 10 # include <stdint.h>
12 #endif 11 #endif
  12 +#include <string>
13 13
14 class MD5 14 class MD5
15 { 15 {
libqpdf/qpdf/PCRE.hh
  View file @f59ff6f
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
5 #ifndef __PCRE_HH__ 5 #ifndef __PCRE_HH__
6 #define __PCRE_HH__ 6 #define __PCRE_HH__
7 7
  8 +#include <qpdf/DLL.h>
  9 +
8 #ifdef _WIN32 10 #ifdef _WIN32
9 # define PCRE_STATIC 11 # define PCRE_STATIC
10 #endif 12 #endif
@@ -12,8 +14,6 @@ @@ -12,8 +14,6 @@
12 #include <string> 14 #include <string>
13 #include <stdexcept> 15 #include <stdexcept>
14 16
15 -#include <qpdf/DLL.h>  
16 -  
17 // Note: this class does not encapsulate all features of the PCRE 17 // Note: this class does not encapsulate all features of the PCRE
18 // package -- only those that I actually need right now are here. 18 // package -- only those that I actually need right now are here.
19 19
libqpdf/qpdf/QPDF_Stream.hh
  View file @f59ff6f
1 #ifndef __QPDF_STREAM_HH__ 1 #ifndef __QPDF_STREAM_HH__
2 #define __QPDF_STREAM_HH__ 2 #define __QPDF_STREAM_HH__
3 3
4 -#include <qpdf/QPDFObject.hh> 4 +#include <qpdf/Types.h>
5 5
  6 +#include <qpdf/QPDFObject.hh>
6 #include <qpdf/QPDFObjectHandle.hh> 7 #include <qpdf/QPDFObjectHandle.hh>
7 8
8 class Pipeline; 9 class Pipeline;