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
This commit is contained in:
parent
71cdef0ed2
commit
484d484c21
|
@ -82,7 +82,7 @@ typedef struct
|
||||||
unsigned long cbAtr;
|
unsigned long cbAtr;
|
||||||
unsigned char rgbAtr[MAX_ATR_SIZE];
|
unsigned char rgbAtr[MAX_ATR_SIZE];
|
||||||
}
|
}
|
||||||
SCARD_READERSTATE;
|
SCARD_READERSTATE, *LPSCARD_READERSTATE;
|
||||||
|
|
||||||
typedef struct _SCARD_IO_REQUEST
|
typedef struct _SCARD_IO_REQUEST
|
||||||
{
|
{
|
||||||
|
@ -92,8 +92,6 @@ typedef struct _SCARD_IO_REQUEST
|
||||||
SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
|
SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
|
||||||
|
|
||||||
typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
|
typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
|
||||||
typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE,
|
|
||||||
*LPSCARD_READERSTATE;
|
|
||||||
|
|
||||||
#endif /* HAVE_SCARD_H */
|
#endif /* HAVE_SCARD_H */
|
||||||
|
|
||||||
|
@ -105,6 +103,11 @@ typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE,
|
||||||
#define PCSC_API
|
#define PCSC_API
|
||||||
#endif
|
#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,
|
typedef LONG (PCSC_API *SCardEstablishContext_t)(DWORD dwScope, LPCVOID pvReserved1,
|
||||||
LPCVOID pvReserved2, LPSCARDCONTEXT phContext);
|
LPCVOID pvReserved2, LPSCARDCONTEXT phContext);
|
||||||
typedef LONG (PCSC_API *SCardReleaseContext_t)(SCARDCONTEXT hContext);
|
typedef LONG (PCSC_API *SCardReleaseContext_t)(SCARDCONTEXT hContext);
|
||||||
|
|
Loading…
Reference in New Issue