OpenJDK / jdk8u / jdk8u / jdk
changeset 9705:4bb29b9c4c0d
8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX
Reviewed-by: valeriep
| author | igerasim |
|---|---|
| date | Fri, 27 Jun 2014 08:03:35 +0400 |
| parents | 8b5ee0c74e7d |
| children | 2e6ee661db36 |
| files | src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h |
| diffstat | 1 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h Fri Jun 27 14:01:17 2014 -0700 +++ b/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,