diff options
| author | Andy Bailey <bailey@akamai.com> | 2011-01-10 20:52:19 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-01-10 20:52:19 -0600 |
| commit | aa4f6633373859b1693d1b982a25193268231c74 (patch) | |
| tree | 070098fe58fc3b45ee989b55dc754020a29992fe /system/coolkey/patches/coolkey-gcc43.patch | |
| parent | 4efe7dc1f10dcb908ad7345369628e7a9749be7e (diff) | |
system/coolkey: Included several upstream patches
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/coolkey/patches/coolkey-gcc43.patch')
| -rw-r--r-- | system/coolkey/patches/coolkey-gcc43.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/system/coolkey/patches/coolkey-gcc43.patch b/system/coolkey/patches/coolkey-gcc43.patch new file mode 100644 index 0000000000000..5e41b5ab702b9 --- /dev/null +++ b/system/coolkey/patches/coolkey-gcc43.patch @@ -0,0 +1,54 @@ +diff -up ./src/coolkey/slot.cpp.coolkey-gcc43 ./src/coolkey/slot.cpp +--- ./src/coolkey/slot.cpp.coolkey-gcc43 2008-02-13 18:01:45.000000000 -0800 ++++ ./src/coolkey/slot.cpp 2008-02-13 18:03:05.000000000 -0800 +@@ -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 +diff -up ./src/coolkey/machdep.cpp.coolkey-gcc43 ./src/coolkey/machdep.cpp +--- ./src/coolkey/machdep.cpp.coolkey-gcc43 2008-02-13 18:02:06.000000000 -0800 ++++ ./src/coolkey/machdep.cpp 2008-02-13 18:04:04.000000000 -0800 +@@ -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 -up ./src/coolkey/log.cpp.coolkey-gcc43 ./src/coolkey/log.cpp +--- ./src/coolkey/log.cpp.coolkey-gcc43 2008-02-13 18:01:55.000000000 -0800 ++++ ./src/coolkey/log.cpp 2008-02-13 18:03:37.000000000 -0800 +@@ -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 -up ./src/coolkey/object.cpp.coolkey-gcc43 ./src/coolkey/object.cpp +--- ./src/coolkey/object.cpp.coolkey-gcc43 2008-02-13 18:02:20.000000000 -0800 ++++ ./src/coolkey/object.cpp 2008-02-13 18:04:22.000000000 -0800 +@@ -21,6 +21,7 @@ + #include "PKCS11Exception.h" + #include "object.h" + #include <algorithm> ++#include <string.h> + + using std::find_if; + |