tweak dll stuff again

git-svn-id: svn+q:///qpdf/trunk@851 71b93d88-0707-0410-a8cf-f5a4172ac649

11 files changed, 66 insertions, 66 deletions

diff --git a/libqpdf/qpdf/BitStream.hh b/libqpdf/qpdf/BitStream.hh
index 75fc3db9..92bbd735 100644
--- a/libqpdf/qpdf/BitStream.hh
+++ b/libqpdf/qpdf/BitStream.hh
@@ -8,13 +8,13 @@
 class BitStream
 {
   public:
-    DLL_EXPORT
+    QPDF_DLL
     BitStream(unsigned char const* p, int nbytes);
-    DLL_EXPORT
+    QPDF_DLL
     void reset();
-    DLL_EXPORT
+    QPDF_DLL
     unsigned long getBits(int nbits);
-    DLL_EXPORT
+    QPDF_DLL
     void skipToNextByte();
 
   private:
diff --git a/libqpdf/qpdf/BitWriter.hh b/libqpdf/qpdf/BitWriter.hh
index 32dc8e49..3ca05e10 100644
--- a/libqpdf/qpdf/BitWriter.hh
+++ b/libqpdf/qpdf/BitWriter.hh
@@ -12,12 +12,12 @@ class BitWriter
   public:
     // Write bits to the pipeline.  It is the caller's responsibility
     // to eventually call finish on the pipeline.
-    DLL_EXPORT
+    QPDF_DLL
     BitWriter(Pipeline* pl);
-    DLL_EXPORT
+    QPDF_DLL
     void writeBits(unsigned long val, int bits);
     // Force any partial byte to be written to the pipeline.
-    DLL_EXPORT
+    QPDF_DLL
     void flush();
 
   private:
diff --git a/libqpdf/qpdf/MD5.hh b/libqpdf/qpdf/MD5.hh
index 7de995a1..ebdd118d 100644
--- a/libqpdf/qpdf/MD5.hh
+++ b/libqpdf/qpdf/MD5.hh
@@ -13,50 +13,50 @@ class MD5
   public:
     typedef unsigned char Digest[16];
 
-    DLL_EXPORT
+    QPDF_DLL
     MD5();
-    DLL_EXPORT
+    QPDF_DLL
     void reset();
 
     // encodes string and finalizes
-    DLL_EXPORT
+    QPDF_DLL
     void encodeString(char const* input_string);
 
     // encodes file and finalizes
-    DLL_EXPORT
+    QPDF_DLL
     void encodeFile(char const* filename, int up_to_size = -1);
 
     // appends string to current md5 object
-    DLL_EXPORT
+    QPDF_DLL
     void appendString(char const* input_string);
 
     // appends arbitrary data to current md5 object
-    DLL_EXPORT
+    QPDF_DLL
     void encodeDataIncrementally(char const* input_data, int len);
 
     // computes a raw digest
-    DLL_EXPORT
+    QPDF_DLL
     void digest(Digest);
 
     // prints the digest to stdout terminated with \r\n (primarily for
     // testing)
-    DLL_EXPORT
+    QPDF_DLL
     void print();
 
     // returns the digest as a hexadecimal string
-    DLL_EXPORT
+    QPDF_DLL
     std::string unparse();
 
     // Convenience functions
-    DLL_EXPORT
+    QPDF_DLL
     static std::string getDataChecksum(char const* buf, int len);
-    DLL_EXPORT
+    QPDF_DLL
     static std::string getFileChecksum(char const* filename,
 				       int up_to_size = -1);
-    DLL_EXPORT
+    QPDF_DLL
     static bool checkDataChecksum(char const* const checksum,
 				  char const* buf, int len);
-    DLL_EXPORT
+    QPDF_DLL
     static bool checkFileChecksum(char const* const checksum,
 				  char const* filename, int up_to_size = -1);
 
diff --git a/libqpdf/qpdf/PCRE.hh b/libqpdf/qpdf/PCRE.hh
index 546c374d..5d1ae458 100644
--- a/libqpdf/qpdf/PCRE.hh
+++ b/libqpdf/qpdf/PCRE.hh
@@ -25,7 +25,7 @@ class PCRE
     class NoBackref: public std::logic_error
     {
       public:
-	DLL_EXPORT
+	QPDF_DLL
 	NoBackref();
 	virtual ~NoBackref() throw() {}
     };
@@ -34,15 +34,15 @@ class PCRE
     {
 	friend class PCRE;
       public:
-	DLL_EXPORT
+	QPDF_DLL
 	Match(int nbackrefs, char const* subject);
-	DLL_EXPORT
+	QPDF_DLL
 	Match(Match const&);
-	DLL_EXPORT
+	QPDF_DLL
 	Match& operator=(Match const&);
-	DLL_EXPORT
+	QPDF_DLL
 	~Match();
-	DLL_EXPORT
+	QPDF_DLL
 	operator bool();
 
 	// All the back reference accessing routines may throw the
@@ -54,13 +54,13 @@ class PCRE
 	// and not matching at all.
 
 	// see getMatch flags below
-	DLL_EXPORT
+	QPDF_DLL
 	std::string getMatch(int n, int flags = 0);
-	DLL_EXPORT
+	QPDF_DLL
 	void getOffsetLength(int n, int& offset, int& length);
-	DLL_EXPORT
+	QPDF_DLL
 	int getOffset(int n);
-	DLL_EXPORT
+	QPDF_DLL
 	int getLength(int n);
 
 	// nMatches returns the number of available matches including
@@ -70,7 +70,7 @@ class PCRE
 	// will return the whole string, getMatch(1) will return the
 	// text that matched the backreference, and getMatch(2) will
 	// throw an exception because it is out of range.
-	DLL_EXPORT
+	QPDF_DLL
 	int nMatches() const;
 
 	// Flags for getMatch
@@ -93,16 +93,16 @@ class PCRE
 
     // The value passed in as options is passed to pcre_exec.  See man
     // pcreapi for details.
-	DLL_EXPORT
+    QPDF_DLL
     PCRE(char const* pattern, int options = 0);
-	DLL_EXPORT
+    QPDF_DLL
     ~PCRE();
 
-	DLL_EXPORT
+    QPDF_DLL
     Match match(char const* subject, int options = 0, int startoffset = 0,
 		int size = -1);
 
-	DLL_EXPORT
+    QPDF_DLL
     static void test(int n = 0);
 
   private:
diff --git a/libqpdf/qpdf/Pl_AES_PDF.hh b/libqpdf/qpdf/Pl_AES_PDF.hh
index e062057b..4f422d35 100644
--- a/libqpdf/qpdf/Pl_AES_PDF.hh
+++ b/libqpdf/qpdf/Pl_AES_PDF.hh
@@ -12,22 +12,22 @@ class Pl_AES_PDF: public Pipeline
   public:
     // key_data should be a pointer to key_size bytes of data
     static unsigned int const key_size = 16;
-    DLL_EXPORT
+    QPDF_DLL
     Pl_AES_PDF(char const* identifier, Pipeline* next,
 	       bool encrypt, unsigned char const key[key_size]);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_AES_PDF();
 
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char* data, int len);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
 
     // For testing only; PDF always uses CBC
-    DLL_EXPORT
+    QPDF_DLL
     void disableCBC();
     // For testing only: use a fixed initialization vector for CBC
-    DLL_EXPORT
+    QPDF_DLL
     static void useStaticIV();
 
   private:
diff --git a/libqpdf/qpdf/Pl_ASCII85Decoder.hh b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
index a2c38da3..333e370c 100644
--- a/libqpdf/qpdf/Pl_ASCII85Decoder.hh
+++ b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
@@ -6,13 +6,13 @@
 class Pl_ASCII85Decoder: public Pipeline
 {
   public:
-    DLL_EXPORT
+    QPDF_DLL
     Pl_ASCII85Decoder(char const* identifier, Pipeline* next);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_ASCII85Decoder();
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char* buf, int len);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
 
   private:
diff --git a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
index 8a7b1899..12808dc8 100644
--- a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
+++ b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
@@ -6,13 +6,13 @@
 class Pl_ASCIIHexDecoder: public Pipeline
 {
   public:
-    DLL_EXPORT
+    QPDF_DLL
     Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_ASCIIHexDecoder();
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char* buf, int len);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
 
   private:
diff --git a/libqpdf/qpdf/Pl_LZWDecoder.hh b/libqpdf/qpdf/Pl_LZWDecoder.hh
index 3226cd6a..b74d69e2 100644
--- a/libqpdf/qpdf/Pl_LZWDecoder.hh
+++ b/libqpdf/qpdf/Pl_LZWDecoder.hh
@@ -9,14 +9,14 @@
 class Pl_LZWDecoder: public Pipeline
 {
   public:
-    DLL_EXPORT
+    QPDF_DLL
     Pl_LZWDecoder(char const* identifier, Pipeline* next,
 		  bool early_code_change);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_LZWDecoder();
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char* buf, int len);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
 
   private:
diff --git a/libqpdf/qpdf/Pl_MD5.hh b/libqpdf/qpdf/Pl_MD5.hh
index 13973f29..28c9f87d 100644
--- a/libqpdf/qpdf/Pl_MD5.hh
+++ b/libqpdf/qpdf/Pl_MD5.hh
@@ -15,15 +15,15 @@
 class Pl_MD5: public Pipeline
 {
   public:
-    DLL_EXPORT
+    QPDF_DLL
     Pl_MD5(char const* identifier, Pipeline* next);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_MD5();
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char*, int);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
-    DLL_EXPORT
+    QPDF_DLL
     std::string getHexDigest();
 
   private:
diff --git a/libqpdf/qpdf/Pl_PNGFilter.hh b/libqpdf/qpdf/Pl_PNGFilter.hh
index eb2ed028..d7c761bd 100644
--- a/libqpdf/qpdf/Pl_PNGFilter.hh
+++ b/libqpdf/qpdf/Pl_PNGFilter.hh
@@ -22,16 +22,16 @@ class Pl_PNGFilter: public Pipeline
     // Encoding is not presently supported
     enum action_e { a_encode, a_decode };
 
-    DLL_EXPORT
+    QPDF_DLL
     Pl_PNGFilter(char const* identifier, Pipeline* next,
 		 action_e action, unsigned int columns,
 		 unsigned int bytes_per_pixel);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_PNGFilter();
 
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char* data, int len);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
 
   private:
diff --git a/libqpdf/qpdf/Pl_RC4.hh b/libqpdf/qpdf/Pl_RC4.hh
index 907b4af8..1a7c94ea 100644
--- a/libqpdf/qpdf/Pl_RC4.hh
+++ b/libqpdf/qpdf/Pl_RC4.hh
@@ -11,16 +11,16 @@ class Pl_RC4: public Pipeline
     static int const def_bufsize = 65536;
 
     // key_len of -1 means treat key_data as a null-terminated string
-    DLL_EXPORT
+    QPDF_DLL
     Pl_RC4(char const* identifier, Pipeline* next,
 	   unsigned char const* key_data, int key_len = -1,
 	   int out_bufsize = def_bufsize);
-    DLL_EXPORT
+    QPDF_DLL
     virtual ~Pl_RC4();
 
-    DLL_EXPORT
+    QPDF_DLL
     virtual void write(unsigned char* data, int len);
-    DLL_EXPORT
+    QPDF_DLL
     virtual void finish();
 
   private: