Commit f71eb2af91fa164ea3d864591fda90098c652927

Authored by Jay Berkenbilt
1 parent 44cbd3d4

fix class-level DLL_EXPORT

git-svn-id: svn+q:///qpdf/trunk@797 71b93d88-0707-0410-a8cf-f5a4172ac649
include/qpdf/Buffer.hh
@@ -10,8 +10,7 @@ @@ -10,8 +10,7 @@
10 10
11 #include <qpdf/DLL.hh> 11 #include <qpdf/DLL.hh>
12 12
13 -DLL_EXPORT  
14 -class Buffer 13 +class DLL_EXPORT Buffer
15 { 14 {
16 public: 15 public:
17 Buffer(); 16 Buffer();
include/qpdf/Pipeline.hh
@@ -33,8 +33,7 @@ @@ -33,8 +33,7 @@
33 #include <qpdf/DLL.hh> 33 #include <qpdf/DLL.hh>
34 #include <string> 34 #include <string>
35 35
36 -DLL_EXPORT  
37 -class Pipeline 36 +class DLL_EXPORT Pipeline
38 { 37 {
39 public: 38 public:
40 Pipeline(char const* identifier, Pipeline* next); 39 Pipeline(char const* identifier, Pipeline* next);
include/qpdf/Pl_Buffer.hh
@@ -24,8 +24,7 @@ @@ -24,8 +24,7 @@
24 #include <qpdf/Buffer.hh> 24 #include <qpdf/Buffer.hh>
25 #include <list> 25 #include <list>
26 26
27 -DLL_EXPORT  
28 -class Pl_Buffer: public Pipeline 27 +class DLL_EXPORT Pl_Buffer: public Pipeline
29 { 28 {
30 public: 29 public:
31 Pl_Buffer(char const* identifier, Pipeline* next = 0); 30 Pl_Buffer(char const* identifier, Pipeline* next = 0);
include/qpdf/Pl_Count.hh
@@ -13,8 +13,7 @@ @@ -13,8 +13,7 @@
13 13
14 #include <qpdf/Pipeline.hh> 14 #include <qpdf/Pipeline.hh>
15 15
16 -DLL_EXPORT  
17 -class Pl_Count: public Pipeline 16 +class DLL_EXPORT Pl_Count: public Pipeline
18 { 17 {
19 public: 18 public:
20 Pl_Count(char const* identifier, Pipeline* next); 19 Pl_Count(char const* identifier, Pipeline* next);
include/qpdf/Pl_Discard.hh
@@ -16,8 +16,7 @@ @@ -16,8 +16,7 @@
16 16
17 #include <qpdf/Pipeline.hh> 17 #include <qpdf/Pipeline.hh>
18 18
19 -DLL_EXPORT  
20 -class Pl_Discard: public Pipeline 19 +class DLL_EXPORT Pl_Discard: public Pipeline
21 { 20 {
22 public: 21 public:
23 Pl_Discard(); 22 Pl_Discard();
include/qpdf/Pl_Flate.hh
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 12
13 #include <zlib.h> 13 #include <zlib.h>
14 14
15 -DLL_EXPORT  
16 -class Pl_Flate: public Pipeline 15 +class DLL_EXPORT Pl_Flate: public Pipeline
17 { 16 {
18 public: 17 public:
19 static int const def_bufsize = 65536; 18 static int const def_bufsize = 65536;
include/qpdf/Pl_StdioFile.hh
@@ -18,8 +18,7 @@ @@ -18,8 +18,7 @@
18 // This pipeline is reusable. 18 // This pipeline is reusable.
19 // 19 //
20 20
21 -DLL_EXPORT  
22 -class Pl_StdioFile: public Pipeline 21 +class DLL_EXPORT Pl_StdioFile: public Pipeline
23 { 22 {
24 public: 23 public:
25 // f is externally maintained; this class just writes to and 24 // f is externally maintained; this class just writes to and
include/qpdf/QPDF.hh
@@ -25,8 +25,7 @@ class BitStream; @@ -25,8 +25,7 @@ class BitStream;
25 class BitWriter; 25 class BitWriter;
26 class QPDFExc; 26 class QPDFExc;
27 27
28 -DLL_EXPORT  
29 -class QPDF 28 +class DLL_EXPORT QPDF
30 { 29 {
31 public: 30 public:
32 QPDF(); 31 QPDF();
include/qpdf/QPDFExc.hh
@@ -11,8 +11,7 @@ @@ -11,8 +11,7 @@
11 #include <qpdf/DLL.hh> 11 #include <qpdf/DLL.hh>
12 #include <stdexcept> 12 #include <stdexcept>
13 13
14 -DLL_EXPORT  
15 -class QPDFExc: public std::runtime_error 14 +class DLL_EXPORT QPDFExc: public std::runtime_error
16 { 15 {
17 public: 16 public:
18 QPDFExc(std::string const& message); 17 QPDFExc(std::string const& message);
include/qpdf/QPDFObject.hh
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 12
13 #include <string> 13 #include <string>
14 14
15 -DLL_EXPORT  
16 -class QPDFObject 15 +class DLL_EXPORT QPDFObject
17 { 16 {
18 public: 17 public:
19 virtual ~QPDFObject() {} 18 virtual ~QPDFObject() {}
include/qpdf/QPDFObjectHandle.hh
@@ -23,8 +23,7 @@ @@ -23,8 +23,7 @@
23 class Pipeline; 23 class Pipeline;
24 class QPDF; 24 class QPDF;
25 25
26 -DLL_EXPORT  
27 -class QPDFObjectHandle 26 +class DLL_EXPORT QPDFObjectHandle
28 { 27 {
29 public: 28 public:
30 QPDFObjectHandle(); 29 QPDFObjectHandle();
include/qpdf/QPDFTokenizer.hh
@@ -13,8 +13,7 @@ @@ -13,8 +13,7 @@
13 #include <string> 13 #include <string>
14 #include <stdio.h> 14 #include <stdio.h>
15 15
16 -DLL_EXPORT  
17 -class QPDFTokenizer 16 +class DLL_EXPORT QPDFTokenizer
18 { 17 {
19 public: 18 public:
20 enum token_type_e 19 enum token_type_e
include/qpdf/QPDFWriter.hh
@@ -31,8 +31,7 @@ class QPDF; @@ -31,8 +31,7 @@ class QPDF;
31 class QPDFObjectHandle; 31 class QPDFObjectHandle;
32 class Pl_Count; 32 class Pl_Count;
33 33
34 -DLL_EXPORT  
35 -class QPDFWriter 34 +class DLL_EXPORT QPDFWriter
36 { 35 {
37 public: 36 public:
38 // Passing null as filename means write to stdout. QPDFWriter 37 // Passing null as filename means write to stdout. QPDFWriter
include/qpdf/QPDFXRefEntry.hh
@@ -10,8 +10,7 @@ @@ -10,8 +10,7 @@
10 10
11 #include <qpdf/DLL.hh> 11 #include <qpdf/DLL.hh>
12 12
13 -DLL_EXPORT  
14 -class QPDFXRefEntry 13 +class DLL_EXPORT QPDFXRefEntry
15 { 14 {
16 public: 15 public:
17 // Type constants are from the PDF spec section 16 // Type constants are from the PDF spec section
libqpdf/qpdf/BitStream.hh
@@ -5,8 +5,7 @@ @@ -5,8 +5,7 @@
5 5
6 #include <qpdf/DLL.hh> 6 #include <qpdf/DLL.hh>
7 7
8 -DLL_EXPORT  
9 -class BitStream 8 +class DLL_EXPORT BitStream
10 { 9 {
11 public: 10 public:
12 BitStream(unsigned char const* p, int nbytes); 11 BitStream(unsigned char const* p, int nbytes);
libqpdf/qpdf/BitWriter.hh
@@ -7,8 +7,7 @@ @@ -7,8 +7,7 @@
7 7
8 class Pipeline; 8 class Pipeline;
9 9
10 -DLL_EXPORT  
11 -class BitWriter 10 +class DLL_EXPORT BitWriter
12 { 11 {
13 public: 12 public:
14 // Write bits to the pipeline. It is the caller's responsibility 13 // Write bits to the pipeline. It is the caller's responsibility
libqpdf/qpdf/MD5.hh
@@ -8,8 +8,7 @@ @@ -8,8 +8,7 @@
8 # include <inttypes.h> 8 # include <inttypes.h>
9 #endif 9 #endif
10 10
11 -DLL_EXPORT  
12 -class MD5 11 +class DLL_EXPORT MD5
13 { 12 {
14 public: 13 public:
15 typedef unsigned char Digest[16]; 14 typedef unsigned char Digest[16];
libqpdf/qpdf/PCRE.hh
@@ -17,8 +17,7 @@ @@ -17,8 +17,7 @@
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
20 -DLL_EXPORT  
21 -class PCRE 20 +class DLL_EXPORT PCRE
22 { 21 {
23 public: 22 public:
24 // This is thrown when an attempt is made to access a non-existent 23 // This is thrown when an attempt is made to access a non-existent
libqpdf/qpdf/Pl_ASCII85Decoder.hh
@@ -3,8 +3,7 @@ @@ -3,8 +3,7 @@
3 3
4 #include <qpdf/Pipeline.hh> 4 #include <qpdf/Pipeline.hh>
5 5
6 -DLL_EXPORT  
7 -class Pl_ASCII85Decoder: public Pipeline 6 +class DLL_EXPORT Pl_ASCII85Decoder: public Pipeline
8 { 7 {
9 public: 8 public:
10 Pl_ASCII85Decoder(char const* identifier, Pipeline* next); 9 Pl_ASCII85Decoder(char const* identifier, Pipeline* next);
libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
@@ -3,8 +3,7 @@ @@ -3,8 +3,7 @@
3 3
4 #include <qpdf/Pipeline.hh> 4 #include <qpdf/Pipeline.hh>
5 5
6 -DLL_EXPORT  
7 -class Pl_ASCIIHexDecoder: public Pipeline 6 +class DLL_EXPORT Pl_ASCIIHexDecoder: public Pipeline
8 { 7 {
9 public: 8 public:
10 Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next); 9 Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next);
libqpdf/qpdf/Pl_LZWDecoder.hh
@@ -6,8 +6,7 @@ @@ -6,8 +6,7 @@
6 #include <qpdf/Buffer.hh> 6 #include <qpdf/Buffer.hh>
7 #include <vector> 7 #include <vector>
8 8
9 -DLL_EXPORT  
10 -class Pl_LZWDecoder: public Pipeline 9 +class DLL_EXPORT Pl_LZWDecoder: public Pipeline
11 { 10 {
12 public: 11 public:
13 Pl_LZWDecoder(char const* identifier, Pipeline* next, 12 Pl_LZWDecoder(char const* identifier, Pipeline* next,
libqpdf/qpdf/Pl_MD5.hh
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 #include <qpdf/Pipeline.hh> 12 #include <qpdf/Pipeline.hh>
13 #include <qpdf/MD5.hh> 13 #include <qpdf/MD5.hh>
14 14
15 -DLL_EXPORT  
16 -class Pl_MD5: public Pipeline 15 +class DLL_EXPORT Pl_MD5: public Pipeline
17 { 16 {
18 public: 17 public:
19 Pl_MD5(char const* identifier, Pipeline* next); 18 Pl_MD5(char const* identifier, Pipeline* next);
libqpdf/qpdf/Pl_PNGFilter.hh
@@ -16,8 +16,7 @@ @@ -16,8 +16,7 @@
16 16
17 #include <qpdf/Pipeline.hh> 17 #include <qpdf/Pipeline.hh>
18 18
19 -DLL_EXPORT  
20 -class Pl_PNGFilter: public Pipeline 19 +class DLL_EXPORT Pl_PNGFilter: public Pipeline
21 { 20 {
22 public: 21 public:
23 // Encoding is not presently supported 22 // Encoding is not presently supported
libqpdf/qpdf/Pl_RC4.hh
@@ -5,8 +5,7 @@ @@ -5,8 +5,7 @@
5 5
6 #include <qpdf/RC4.hh> 6 #include <qpdf/RC4.hh>
7 7
8 -DLL_EXPORT  
9 -class Pl_RC4: public Pipeline 8 +class DLL_EXPORT Pl_RC4: public Pipeline
10 { 9 {
11 public: 10 public:
12 static int const def_bufsize = 65536; 11 static int const def_bufsize = 65536;