Changeset 3460

Show
Ignore:
Timestamp:
04/04/08 18:46:50 (8 months ago)
Author:
alonbl
Message:

Fix some duplicate symbols with Windows header files.
Thanks to Douglas E. Engert.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/libopensc/internal-winscard.h

    r3458 r3460  
    2929#endif 
    3030 
     31#ifndef _MSC_VER 
    3132#define MAX_ATR_SIZE                    33      /**< Maximum ATR size */ 
    3233 
    … …  
    6263#define SCARD_CTL_CODE(code) (0x42000000 + (code)) 
    6364 
    64 #if defined(_WIN32) 
    65 #define PCSC_API WINAPI 
    66 #elif defined(USE_CYGWIN) 
    67 #define PCSC_API __stdcall 
    68 #else 
    69 #define PCSC_API 
    70 #endif 
    71  
    7265typedef const BYTE *LPCBYTE; 
    7366typedef long SCARDCONTEXT; /**< \p hContext returned by SCardEstablishContext() */ 
    … …  
    9588} 
    9689SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; 
     90 
     91#endif  /* MSC_VER */ 
     92 
     93#if defined(_WIN32) 
     94#define PCSC_API WINAPI 
     95#elif defined(USE_CYGWIN) 
     96#define PCSC_API __stdcall 
     97#else 
     98#define PCSC_API 
     99#endif 
    97100 
    98101typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;