From 76bf91765e0b25066a47cbd52df07645239c5a78 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 4 May 2008 16:02:53 +0000
Subject: missing header files for gcc 4.3

git-svn-id: svn+q:///qpdf/trunk@607 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 ChangeLog                     | 4 ++--
 examples/pdf-bookmarks.cc     | 1 +
 examples/pdf-npages.cc        | 3 +--
 libqpdf/PCRE.cc               | 2 +-
 libqpdf/Pl_Buffer.cc          | 1 +
 libqpdf/Pl_QPDFTokenizer.cc   | 1 +
 libqpdf/QPDFObjectHandle.cc   | 2 ++
 libqpdf/QPDFTokenizer.cc      | 2 ++
 libqpdf/QPDFWriter.cc         | 4 +++-
 libqpdf/QPDF_Name.cc          | 2 ++
 libqpdf/QPDF_encryption.cc    | 2 ++
 libqpdf/QPDF_linearization.cc | 1 +
 libqpdf/QUtil.cc              | 1 +
 libtests/ascii85.cc           | 1 +
 libtests/buffer.cc            | 1 +
 libtests/flate.cc             | 2 ++
 libtests/hex.cc               | 3 ++-
 libtests/lzw.cc               | 1 +
 libtests/pcre.cc              | 1 +
 libtests/png_filter.cc        | 2 ++
 libtests/qexc.cc              | 1 +
 libtests/qutil.cc             | 1 +
 qpdf/test_driver.cc           | 1 +
 23 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 21de3797..3d1f02c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2008-05-03  Jay Berkenbilt  <ejb@ql.org>
+2008-05-04  Jay Berkenbilt  <ejb@ql.org>
 
-	* libqpdf/PCRE.cc: added missing include of <string.h>
+	* updated several files for gcc 4.3 (extra includes)
 
 2008-04-26  Jay Berkenbilt  <ejb@ql.org>
 
diff --git a/examples/pdf-bookmarks.cc b/examples/pdf-bookmarks.cc
index 98bff7fe..4f878211 100644
--- a/examples/pdf-bookmarks.cc
+++ b/examples/pdf-bookmarks.cc
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string.h>
+#include <stdlib.h>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>
 #include <qpdf/QTC.hh>
diff --git a/examples/pdf-npages.cc b/examples/pdf-npages.cc
index 53074d05..b5ef6479 100644
--- a/examples/pdf-npages.cc
+++ b/examples/pdf-npages.cc
@@ -1,7 +1,6 @@
-
-
 #include <iostream>
 #include <string.h>
+#include <stdlib.h>
 
 #include <qpdf/QPDF.hh>
 
diff --git a/libqpdf/PCRE.cc b/libqpdf/PCRE.cc
index d8e38a25..59174f67 100644
--- a/libqpdf/PCRE.cc
+++ b/libqpdf/PCRE.cc
@@ -3,7 +3,7 @@
 #include <qpdf/QUtil.hh>
 
 #include <iostream>
-#include <strlen.h>
+#include <string.h>
 
 PCRE::Exception::Exception(std::string const& message)
 {
diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc
index 185cf636..27e1004e 100644
--- a/libqpdf/Pl_Buffer.cc
+++ b/libqpdf/Pl_Buffer.cc
@@ -2,6 +2,7 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QEXC.hh>
 #include <assert.h>
+#include <string.h>
 
 Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),
diff --git a/libqpdf/Pl_QPDFTokenizer.cc b/libqpdf/Pl_QPDFTokenizer.cc
index 63f0caaf..27b8c680 100644
--- a/libqpdf/Pl_QPDFTokenizer.cc
+++ b/libqpdf/Pl_QPDFTokenizer.cc
@@ -2,6 +2,7 @@
 #include <qpdf/Pl_QPDFTokenizer.hh>
 #include <qpdf/QPDF_String.hh>
 #include <qpdf/QPDF_Name.hh>
+#include <string.h>
 
 Pl_QPDFTokenizer::Pl_QPDFTokenizer(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 9fba7b43..1571c114 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -16,6 +16,8 @@
 #include <qpdf/QEXC.hh>
 #include <qpdf/QUtil.hh>
 
+#include <stdlib.h>
+
 QPDFObjectHandle::QPDFObjectHandle() :
     initialized(false),
     objid(0),
diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index 4eed6f16..d1f3a4af 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -9,6 +9,8 @@
 #include <qpdf/QEXC.hh>
 #include <qpdf/QTC.hh>
 
+#include <string.h>
+
 // See note above about ctype.
 static bool is_hex_digit(char ch)
 {
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index 0a611eb9..175e0c8f 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -19,6 +19,8 @@
 #include <qpdf/QPDF_Name.hh>
 #include <qpdf/QPDF_String.hh>
 
+#include <stdlib.h>
+
 QPDFWriter::QPDFWriter(QPDF& pdf, char const* filename) :
     pdf(pdf),
     filename(filename),
@@ -233,7 +235,7 @@ QPDFWriter::setEncryptionParameters(
     for (std::set<int>::iterator iter = bits_to_clear.begin();
 	 iter != bits_to_clear.end(); ++iter)
     {
-	P |= (1 << (*iter) - 1);
+	P |= ((1 << (*iter)) - 1);
     }
     P = ~P;
 
diff --git a/libqpdf/QPDF_Name.cc b/libqpdf/QPDF_Name.cc
index f57ced04..d3c4ed40 100644
--- a/libqpdf/QPDF_Name.cc
+++ b/libqpdf/QPDF_Name.cc
@@ -1,6 +1,8 @@
 
 #include <qpdf/QPDF_Name.hh>
 
+#include <string.h>
+
 QPDF_Name::QPDF_Name(std::string const& name) :
     name(name)
 {
diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc
index e5e2d8be..7edeca29 100644
--- a/libqpdf/QPDF_encryption.cc
+++ b/libqpdf/QPDF_encryption.cc
@@ -10,6 +10,8 @@
 #include <qpdf/RC4.hh>
 #include <qpdf/MD5.hh>
 
+#include <string.h>
+
 static char const padding_string[] = {
     0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41,
     0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08,
diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc
index 6c0cf3be..a649936c 100644
--- a/libqpdf/QPDF_linearization.cc
+++ b/libqpdf/QPDF_linearization.cc
@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <assert.h>
 #include <math.h>
+#include <string.h>
 
 template <class T>
 static void
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index c0de95f7..d6b503fb 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef _WIN32
 #include <Windows.h>
 #include <direct.h>
diff --git a/libtests/ascii85.cc b/libtests/ascii85.cc
index 4b5fed13..8be7175d 100644
--- a/libtests/ascii85.cc
+++ b/libtests/ascii85.cc
@@ -2,6 +2,7 @@
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <iostream>
+#include <stdlib.h>
 
 int main()
 {
diff --git a/libtests/buffer.cc b/libtests/buffer.cc
index 6494c5c4..13d16b50 100644
--- a/libtests/buffer.cc
+++ b/libtests/buffer.cc
@@ -2,6 +2,7 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/Pl_Count.hh>
 #include <qpdf/Pl_Discard.hh>
+#include <stdlib.h>
 
 typedef unsigned char* uc;
 
diff --git a/libtests/flate.cc b/libtests/flate.cc
index 0b5b8977..b6059a21 100644
--- a/libtests/flate.cc
+++ b/libtests/flate.cc
@@ -5,6 +5,8 @@
 
 #include <iostream>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
 
 FILE* safe_fopen(char const* filename, char const* mode)
 {
diff --git a/libtests/hex.cc b/libtests/hex.cc
index 0bd6354a..5278f95f 100644
--- a/libtests/hex.cc
+++ b/libtests/hex.cc
@@ -2,6 +2,7 @@
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <iostream>
+#include <stdlib.h>
 
 int main()
 {
@@ -29,7 +30,7 @@ int main()
     catch (std::exception& e)
     {
 	std::cerr << e.what() << std::endl;
-	exit(2);
+	 exit(2);
     }
 
     return 0;
diff --git a/libtests/lzw.cc b/libtests/lzw.cc
index 38c8e541..09ded352 100644
--- a/libtests/lzw.cc
+++ b/libtests/lzw.cc
@@ -2,6 +2,7 @@
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <iostream>
+#include <stdlib.h>
 
 int main()
 {
diff --git a/libtests/pcre.cc b/libtests/pcre.cc
index 0df692a3..8ff7fba0 100644
--- a/libtests/pcre.cc
+++ b/libtests/pcre.cc
@@ -1,6 +1,7 @@
 
 #include <qpdf/PCRE.hh>
 #include <iostream>
+#include <string.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/libtests/png_filter.cc b/libtests/png_filter.cc
index eef1aa3d..4a888bf9 100644
--- a/libtests/png_filter.cc
+++ b/libtests/png_filter.cc
@@ -5,6 +5,8 @@
 #include <iostream>
 #include <errno.h>
 #include <assert.h>
+#include <string.h>
+#include <stdlib.h>
 
 FILE* safe_fopen(char const* filename, char const* mode)
 {
diff --git a/libtests/qexc.cc b/libtests/qexc.cc
index db12d39c..87e56820 100644
--- a/libtests/qexc.cc
+++ b/libtests/qexc.cc
@@ -2,6 +2,7 @@
 #include <qpdf/QEXC.hh>
 #include <iostream>
 #include <errno.h>
+#include <stdlib.h>
 
 void do_terminate()
 {
diff --git a/libtests/qutil.cc b/libtests/qutil.cc
index 3a1fc8aa..0dfa0277 100644
--- a/libtests/qutil.cc
+++ b/libtests/qutil.cc
@@ -5,6 +5,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <qpdf/QUtil.hh>
+#include <string.h>
 
 #ifdef _WIN32
 # include <io.h>
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc
index 7333cc69..cdaa4cc5 100644
--- a/qpdf/test_driver.cc
+++ b/qpdf/test_driver.cc
@@ -9,6 +9,7 @@
 #include <qpdf/QPDFWriter.hh>
 #include <iostream>
 #include <string.h>
+#include <stdlib.h>
 #include <map>
 
 static char const* whoami = 0;
-- 
cgit v1.2.3-54-g00ecf