diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-09-01 11:08:36 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-09-01 11:08:36 +0000 |
| commit | 6e8b1f4e23d4d3acebacb8c92b328d2a9c6b3ef3 (patch) | |
| tree | d6c29d996655105682d6cfcb9d05f8a5f3754dbb /security/opensc | |
| parent | 8ead05e378b309cadc822dc3ad877e4f71996963 (diff) | |
| download | ports-6e8b1f4e23d4d3acebacb8c92b328d2a9c6b3ef3.tar.gz ports-6e8b1f4e23d4d3acebacb8c92b328d2a9c6b3ef3.zip | |
Fix build with latest pcsc-lite.
Notes
Notes:
svn path=/head/; revision=260353
Diffstat (limited to 'security/opensc')
| -rw-r--r-- | security/opensc/files/patch-src_libopensc_internal-winscard.h | 11 | ||||
| -rw-r--r-- | security/opensc/files/patch-src_libopensc_reader-pcsc.c | 29 |
2 files changed, 40 insertions, 0 deletions
diff --git a/security/opensc/files/patch-src_libopensc_internal-winscard.h b/security/opensc/files/patch-src_libopensc_internal-winscard.h new file mode 100644 index 000000000000..da3e56ed880f --- /dev/null +++ b/security/opensc/files/patch-src_libopensc_internal-winscard.h @@ -0,0 +1,11 @@ +--- src/libopensc/internal-winscard.h.orig 2010-09-01 11:37:56.000000000 +0200 ++++ src/libopensc/internal-winscard.h 2010-09-01 11:38:31.000000000 +0200 +@@ -113,7 +113,7 @@ + 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 --git a/security/opensc/files/patch-src_libopensc_reader-pcsc.c b/security/opensc/files/patch-src_libopensc_reader-pcsc.c new file mode 100644 index 000000000000..5446f9ae73e1 --- /dev/null +++ b/security/opensc/files/patch-src_libopensc_reader-pcsc.c @@ -0,0 +1,29 @@ +--- src/libopensc/reader-pcsc.c.orig 2010-09-01 12:44:28.000000000 +0200 ++++ src/libopensc/reader-pcsc.c 2010-09-01 12:44:52.000000000 +0200 +@@ -80,7 +80,7 @@ + + 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 @@ + 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 @@ + /* 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 */ |