From 6f226114387333e03e7f166adf9e93ec5a4bca29 Mon Sep 17 00:00:00 2001
From: alonbl <alonbl@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Fri, 4 Apr 2008 16:46:50 +0000
Subject: [PATCH] Fix some duplicate symbols with Windows header files. Thanks
 to Douglas E. Engert.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3460 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/internal-winscard.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/libopensc/internal-winscard.h b/src/libopensc/internal-winscard.h
index 833aa2de..ae85ac02 100644
--- a/src/libopensc/internal-winscard.h
+++ b/src/libopensc/internal-winscard.h
@@ -28,6 +28,7 @@ typedef unsigned __int8 uint8_t;
 #warning no uint32_t type available, please contact opensc-devel@opensc-project.org
 #endif
 
+#ifndef _MSC_VER
 #define MAX_ATR_SIZE			33	/**< Maximum ATR size */
 
 #define SCARD_PROTOCOL_T0		0x0001	/**< T=0 active protocol. */
@@ -61,14 +62,6 @@ typedef unsigned __int8 uint8_t;
 
 #define SCARD_CTL_CODE(code) (0x42000000 + (code))
 
-#if defined(_WIN32)
-#define PCSC_API WINAPI
-#elif defined(USE_CYGWIN)
-#define PCSC_API __stdcall
-#else
-#define PCSC_API
-#endif
-
 typedef const BYTE *LPCBYTE;
 typedef long SCARDCONTEXT; /**< \p hContext returned by SCardEstablishContext() */
 typedef SCARDCONTEXT *PSCARDCONTEXT;
@@ -95,6 +88,16 @@ typedef struct _SCARD_IO_REQUEST
 }
 SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
 
+#endif	/* MSC_VER */
+
+#if defined(_WIN32)
+#define PCSC_API WINAPI
+#elif defined(USE_CYGWIN)
+#define PCSC_API __stdcall
+#else
+#define PCSC_API
+#endif
+
 typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
 typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
 	*LPSCARD_READERSTATE_A;