Author: jmagne
Update of /cvs/dirsec/coolkey/src/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4582
Modified Files: log.cpp machdep.cpp object.cpp slot.cpp Log Message: Fix for gcc 4.3, bug#427666, rev. rrelyea.
Index: log.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/log.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- log.cpp 14 Feb 2007 19:54:01 -0000 1.2 +++ log.cpp 14 Feb 2008 23:48:19 -0000 1.3 @@ -18,6 +18,8 @@ * ***** END COPYRIGHT BLOCK *****/
#include <string> +#include <string.h> +#include <stdlib.h> #include "mypkcs11.h" #include <assert.h> #include <stdio.h>
Index: machdep.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- machdep.cpp 15 Aug 2007 00:34:17 -0000 1.6 +++ machdep.cpp 14 Feb 2008 23:48:19 -0000 1.7 @@ -33,6 +33,8 @@ #include <sys/stat.h> #include <sys/mman.h> #include <pthread.h> +#include <string.h> +#include <stdlib.h> #endif
#ifdef _WIN32
Index: object.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/object.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- object.cpp 9 Feb 2007 18:53:21 -0000 1.2 +++ object.cpp 14 Feb 2008 23:48:19 -0000 1.3 @@ -21,6 +21,7 @@ #include "PKCS11Exception.h" #include "object.h" #include <algorithm> +#include <string.h>
using std::find_if;
Index: slot.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- slot.cpp 16 Oct 2007 00:05:31 -0000 1.9 +++ slot.cpp 14 Feb 2008 23:48:19 -0000 1.10 @@ -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
389-commits@lists.fedoraproject.org