diff -up opensc-0.11.13/src/libopensc/internal-winscard.h.build opensc-0.11.13/src/libopensc/internal-winscard.h --- opensc-0.11.13/src/libopensc/internal-winscard.h.build 2010-02-16 10:03:28.000000000 +0100 +++ opensc-0.11.13/src/libopensc/internal-winscard.h 2010-09-07 10:34:20.000000000 +0200 @@ -88,7 +88,7 @@ SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *L typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A, - *LPSCARD_READERSTATE_A; + *LPSCARD_READERSTATE_A, *LPSCARD_READERSTATE; #endif /* HAVE_SCARD_H */ @@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen); typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout, - LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders); + LPSCARD_READERSTATE rgReaderStates, DWORD cReaders); typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength, LPVOID pbRecvBuffer, LPDWORD lpBytesReturned); typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, diff -up opensc-0.11.13/src/libopensc/reader-pcsc.c.build opensc-0.11.13/src/libopensc/reader-pcsc.c --- opensc-0.11.13/src/libopensc/reader-pcsc.c.build 2010-02-16 10:03:28.000000000 +0100 +++ opensc-0.11.13/src/libopensc/reader-pcsc.c 2010-09-07 10:34:51.000000000 +0200 @@ -80,7 +80,7 @@ struct pcsc_private_data { struct pcsc_slot_data { SCARDHANDLE pcsc_card; - SCARD_READERSTATE_A reader_state; + SCARD_READERSTATE reader_state; DWORD verify_ioctl; DWORD verify_ioctl_start; DWORD verify_ioctl_finish; @@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader sc_context_t *ctx; SCARDCONTEXT pcsc_ctx; LONG ret; - SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS]; + SCARD_READERSTATE rgReaderStates[SC_MAX_READERS]; unsigned long on_bits, off_bits; time_t end_time, now, delta; size_t i; @@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader /* Wait for a status change and return if it's a card insert/removal */ for( ; ; ) { - SCARD_READERSTATE_A *rsp; + SCARD_READERSTATE *rsp; /* Scan the current state of all readers to see if they * match any of the events we're polling for */