From 484d484c21b59c3aaf6e2b577dbc19ddb8f5cfe7 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 16 Aug 2010 08:59:05 +0000 Subject: [PATCH] PC/SC: Fix building on OS X and mingw32 after r4626 git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4628 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/internal-winscard.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libopensc/internal-winscard.h b/src/libopensc/internal-winscard.h index e979bff7..14f17bb4 100644 --- a/src/libopensc/internal-winscard.h +++ b/src/libopensc/internal-winscard.h @@ -82,7 +82,7 @@ typedef struct unsigned long cbAtr; unsigned char rgbAtr[MAX_ATR_SIZE]; } -SCARD_READERSTATE; +SCARD_READERSTATE, *LPSCARD_READERSTATE; typedef struct _SCARD_IO_REQUEST { @@ -92,8 +92,6 @@ typedef struct _SCARD_IO_REQUEST SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; -typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE, - *LPSCARD_READERSTATE; #endif /* HAVE_SCARD_H */ @@ -105,6 +103,11 @@ typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE, #define PCSC_API #endif +/* OS X 10.6.4 does not have pcsc-lite >= 1.6.4 */ +#if defined(__APPLE__) +#define LPSCARD_READERSTATE LPSCARD_READERSTATE_A +#endif + typedef LONG (PCSC_API *SCardEstablishContext_t)(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext); typedef LONG (PCSC_API *SCardReleaseContext_t)(SCARDCONTEXT hContext);