diff options
author | jmagne <jmagne@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2008-02-14 23:48:19 +0000 |
---|---|---|
committer | jmagne <jmagne@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2008-02-14 23:48:19 +0000 |
commit | d0af5393c77ab7f924ff7f754e92dc0640149cc4 (patch) | |
tree | cb50a89f2ab17438d3d5716cebbc7632265aa285 /src | |
parent | 607ac9b1bffdf68b0f54d3a58aee022ca972fd8d (diff) |
Fix for gcc 4.3, bug#427666, rev. rrelyea.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@72 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
Diffstat (limited to 'src')
-rw-r--r-- | src/coolkey/log.cpp | 2 | ||||
-rw-r--r-- | src/coolkey/machdep.cpp | 2 | ||||
-rw-r--r-- | src/coolkey/object.cpp | 1 | ||||
-rw-r--r-- | src/coolkey/slot.cpp | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/coolkey/log.cpp b/src/coolkey/log.cpp index 66aaab5..1e44cf1 100644 --- a/src/coolkey/log.cpp +++ b/src/coolkey/log.cpp @@ -18,6 +18,8 @@ * ***** END COPYRIGHT BLOCK *****/ #include <string> +#include <string.h> +#include <stdlib.h> #include "mypkcs11.h" #include <assert.h> #include <stdio.h> diff --git a/src/coolkey/machdep.cpp b/src/coolkey/machdep.cpp index 21c73cf..49d0c57 100644 --- a/src/coolkey/machdep.cpp +++ b/src/coolkey/machdep.cpp @@ -33,6 +33,8 @@ #include <sys/stat.h> #include <sys/mman.h> #include <pthread.h> +#include <string.h> +#include <stdlib.h> #endif #ifdef _WIN32 diff --git a/src/coolkey/object.cpp b/src/coolkey/object.cpp index bcf44c6..646bcd9 100644 --- a/src/coolkey/object.cpp +++ b/src/coolkey/object.cpp @@ -21,6 +21,7 @@ #include "PKCS11Exception.h" #include "object.h" #include <algorithm> +#include <string.h> using std::find_if; diff --git a/src/coolkey/slot.cpp b/src/coolkey/slot.cpp index 577df24..8792d5a 100644 --- a/src/coolkey/slot.cpp +++ b/src/coolkey/slot.cpp @@ -25,7 +25,6 @@ #include "PKCS11Exception.h" #include <winscard.h> #include "slot.h" -#include <memory.h> #include "zlib.h" #include "params.h" @@ -33,7 +32,6 @@ #define MIN(x, y) ((x) < (y) ? (x) : (y)) -using std::auto_ptr; #ifdef DEBUG |