24654747 coolkey fails to build with studio 12.5
authorIvo Raisr <ivo.raisr@oracle.com>
Thu, 29 Sep 2016 01:54:21 -0700
changeset 6998 ecb236c14ed7
parent 6997 a189d9fb566c
child 6999 1238e930f8af
24654747 coolkey fails to build with studio 12.5
components/coolkey/Makefile
components/coolkey/patches/06-slot.cpp.patch
--- a/components/coolkey/Makefile	Wed Sep 14 07:52:16 2016 -0700
+++ b/components/coolkey/Makefile	Thu Sep 29 01:54:21 2016 -0700
@@ -61,6 +61,9 @@
 # configuration related patch needs aclocal to be regenerated
 COMPONENT_PREP_ACTION += (cd $(@D); autoconf);
 
+# Allow building with Developer Studio 12.5.
+CXX	:= $(CXX) -std=sun03
+
 # Do not add the SUNWspro area to the RUNPATH. Follow exactly what CC does.
 LD_UNSET.32.i386	= -R$(SPRO_VROOT)/lib
 LD_UNSET.32.sparc	= -R$(SPRO_VROOT)/lib/$(MACH):$(SPRO_VROOT)/lib
--- a/components/coolkey/patches/06-slot.cpp.patch	Wed Sep 14 07:52:16 2016 -0700
+++ b/components/coolkey/patches/06-slot.cpp.patch	Thu Sep 29 01:54:21 2016 -0700
@@ -5,6 +5,24 @@
 
 --- ORIGINAL/./src/coolkey/slot.cpp	2016-06-24 16:07:20.111616788 -0400
 +++ ././src/coolkey/slot.cpp	2016-06-27 21:05:04.901200633 -0400
[email protected]@ -25,7 +25,6 @@
+ #include "PKCS11Exception.h"
+ #include <winscard.h>
+ #include "slot.h"
+-#include <memory.h>
+ #include "zlib.h"
+ #include "params.h"
+
[email protected]@ -33,9 +32,7 @@
+
+ #define MIN(x, y) ((x) < (y) ? (x) : (y))
+
+-using std::auto_ptr;
+
+-
+ #ifdef DEBUG
+ #define PRINTF(args) printf args
+ #else
 @@ -56,6 +56,34 @@
  {  0x3B, 0x6F, 0x00, 0xFF, 0x52, 0x53, 0x41, 0x53, 0x65, 0x63, 0x75, 0x72,
     0x49, 0x44, 0x28, 0x52, 0x29, 0x31, 0x30 };