Commit f59ff6fcc2fc2a2006101838ff0cebd5b32d9886
1 parent
fbe68d63
fix include order for off_t
Showing
11 changed files
with
23 additions
and
15 deletions
include/qpdf/Pl_Count.hh
include/qpdf/QPDF.hh
| ... | ... | @@ -8,15 +8,15 @@ |
| 8 | 8 | #ifndef __QPDF_HH__ |
| 9 | 9 | #define __QPDF_HH__ |
| 10 | 10 | |
| 11 | +#include <qpdf/DLL.h> | |
| 12 | +#include <qpdf/Types.h> | |
| 13 | + | |
| 11 | 14 | #include <stdio.h> |
| 12 | 15 | #include <string> |
| 13 | 16 | #include <map> |
| 14 | 17 | #include <list> |
| 15 | 18 | #include <iostream> |
| 16 | 19 | |
| 17 | -#include <qpdf/DLL.h> | |
| 18 | -#include <qpdf/Types.h> | |
| 19 | - | |
| 20 | 20 | #include <qpdf/QPDFXRefEntry.hh> |
| 21 | 21 | #include <qpdf/QPDFObjectHandle.hh> |
| 22 | 22 | #include <qpdf/QPDFTokenizer.hh> | ... | ... |
include/qpdf/QPDFExc.hh
include/qpdf/QPDFObjectHandle.hh
| ... | ... | @@ -8,14 +8,14 @@ |
| 8 | 8 | #ifndef __QPDFOBJECTHANDLE_HH__ |
| 9 | 9 | #define __QPDFOBJECTHANDLE_HH__ |
| 10 | 10 | |
| 11 | +#include <qpdf/DLL.h> | |
| 12 | +#include <qpdf/Types.h> | |
| 13 | + | |
| 11 | 14 | #include <string> |
| 12 | 15 | #include <vector> |
| 13 | 16 | #include <set> |
| 14 | 17 | #include <map> |
| 15 | 18 | |
| 16 | -#include <qpdf/DLL.h> | |
| 17 | -#include <qpdf/Types.h> | |
| 18 | - | |
| 19 | 19 | #include <qpdf/PointerHolder.hh> |
| 20 | 20 | #include <qpdf/Buffer.hh> |
| 21 | 21 | ... | ... |
include/qpdf/QPDFWriter.hh
| ... | ... | @@ -12,6 +12,9 @@ |
| 12 | 12 | #ifndef __QPDFWRITER_HH__ |
| 13 | 13 | #define __QPDFWRITER_HH__ |
| 14 | 14 | |
| 15 | +#include <qpdf/DLL.h> | |
| 16 | +#include <qpdf/Types.h> | |
| 17 | + | |
| 15 | 18 | #include <stdio.h> |
| 16 | 19 | #include <string> |
| 17 | 20 | #include <list> |
| ... | ... | @@ -19,9 +22,7 @@ |
| 19 | 22 | #include <set> |
| 20 | 23 | #include <map> |
| 21 | 24 | |
| 22 | -#include <qpdf/DLL.h> | |
| 23 | 25 | #include <qpdf/Constants.h> |
| 24 | -#include <qpdf/Types.h> | |
| 25 | 26 | |
| 26 | 27 | #include <qpdf/QPDFXRefEntry.hh> |
| 27 | 28 | ... | ... |
include/qpdf/QUtil.hh
include/qpdf/Types.h
| 1 | 1 | #ifndef __QPDFTYPES_H__ |
| 2 | 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 | 8 | /* Attempt to provide off_t and size_t on any recent platform. To |
| 5 | 9 | * make cross compilation easier and to be more portable across |
| 6 | 10 | * platforms, QPDF avoids having any public header files use the | ... | ... |
include/qpdf/qpdf-c.h
libqpdf/qpdf/MD5.hh
| 1 | 1 | #ifndef __MD5_HH__ |
| 2 | 2 | #define __MD5_HH__ |
| 3 | 3 | |
| 4 | -#include <string> | |
| 5 | 4 | #include <qpdf/DLL.h> |
| 6 | 5 | #include <qpdf/qpdf-config.h> |
| 7 | 6 | #ifdef HAVE_INTTYPES_H |
| ... | ... | @@ -10,6 +9,7 @@ |
| 10 | 9 | #ifdef HAVE_STDINT_H |
| 11 | 10 | # include <stdint.h> |
| 12 | 11 | #endif |
| 12 | +#include <string> | |
| 13 | 13 | |
| 14 | 14 | class MD5 |
| 15 | 15 | { | ... | ... |
libqpdf/qpdf/PCRE.hh
| ... | ... | @@ -5,6 +5,8 @@ |
| 5 | 5 | #ifndef __PCRE_HH__ |
| 6 | 6 | #define __PCRE_HH__ |
| 7 | 7 | |
| 8 | +#include <qpdf/DLL.h> | |
| 9 | + | |
| 8 | 10 | #ifdef _WIN32 |
| 9 | 11 | # define PCRE_STATIC |
| 10 | 12 | #endif |
| ... | ... | @@ -12,8 +14,6 @@ |
| 12 | 14 | #include <string> |
| 13 | 15 | #include <stdexcept> |
| 14 | 16 | |
| 15 | -#include <qpdf/DLL.h> | |
| 16 | - | |
| 17 | 17 | // Note: this class does not encapsulate all features of the PCRE |
| 18 | 18 | // package -- only those that I actually need right now are here. |
| 19 | 19 | ... | ... |