# HG changeset patch # User igerasim # Date 1403841815 -14400 # Node ID a97b521192b68173b94060c386e353270eb2b3dc # Parent f861c3fec754aff5e2d06a17d84e375aa6ea75f1 8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX Reviewed-by: valeriep diff -r f861c3fec754 -r a97b521192b6 jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h --- a/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h Thu Jun 26 10:48:43 2014 -0700 +++ b/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h Fri Jun 27 08:03:35 2014 +0400 @@ -75,6 +75,13 @@ } SCARD_READERSTATE_A; +typedef struct _SCARD_IO_REQUEST +{ + unsigned long dwProtocol; /* Protocol identifier */ + unsigned long cbPciLength; /* Protocol Control Inf Length */ +} +SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; + #else // __APPLE__ #pragma pack(1) @@ -88,6 +95,13 @@ unsigned char rgbAtr[MAX_ATR_SIZE]; } SCARD_READERSTATE_A; + +typedef struct _SCARD_IO_REQUEST +{ + uint32_t dwProtocol; /* Protocol identifier */ + uint32_t cbPciLength; /* Protocol Control Inf Length */ +} +SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; #pragma pack() #endif // __APPLE__ @@ -95,13 +109,6 @@ typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A, *LPSCARD_READERSTATE_A; -typedef struct _SCARD_IO_REQUEST -{ - unsigned long dwProtocol; /* Protocol identifier */ - unsigned long cbPciLength; /* Protocol Control Inf Length */ -} -SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; - typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; extern SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci,