diff --git a/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h b/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h index 02e7035b31c..251d83de930 100644 --- a/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h +++ b/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h @@ -75,6 +75,13 @@ typedef struct } 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 @@ typedef struct 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 @@ SCARD_READERSTATE_A; 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,