[Pcsclite-cvs-commit] r2018 - trunk/PCSC/src/PCSC

[Ludovic Rousseau]

Author: rousseau
Date: 2006-04-20 18:56:49 +0000 (Thu, 20 Apr 2006)
New Revision: 2018

Modified:
   trunk/PCSC/src/PCSC/ifdhandler.h
Log:
do not use EXTERNAL to export the symbols (revert the previous patch)


Modified: trunk/PCSC/src/PCSC/ifdhandler.h
===================================================================
--- trunk/PCSC/src/PCSC/ifdhandler.h	2006-04-20 14:39:52 UTC (rev 2017)
+++ trunk/PCSC/src/PCSC/ifdhandler.h	2006-04-20 18:56:49 UTC (rev 2018)
@@ -23,12 +23,6 @@
 {
 #endif
 
-/* EXTERNAL may be defined by driver
- * see misc.h from pcsc-lite */
-#ifndef EXTERNAL
-#define EXTERNAL
-#endif
-
 	/*
 	 * List of data structures available to ifdhandler 
 	 */
@@ -164,8 +158,8 @@
 	 * IFDHControl() API changed
 	 */
 
-	EXTERNAL RESPONSECODE IFDHCreateChannelByName(DWORD, LPTSTR);
-	EXTERNAL RESPONSECODE IFDHControl(DWORD, DWORD, PUCHAR, DWORD, PUCHAR,
+	RESPONSECODE IFDHCreateChannelByName(DWORD, LPTSTR);
+	RESPONSECODE IFDHControl(DWORD, DWORD, PUCHAR, DWORD, PUCHAR,
 		DWORD, LPDWORD);
 #else
 
@@ -173,42 +167,42 @@
 	 * List of Defined Functions Available to IFD_Handler 2.0 
 	 */
 
-	EXTERNAL RESPONSECODE IFDHControl(DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
+	RESPONSECODE IFDHControl(DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
 
 #endif
 
 	/*
 	 * common functions in IFD_Handler 2.0 and 3.0
 	 */
-	EXTERNAL RESPONSECODE IFDHCreateChannel(DWORD, DWORD);
-	EXTERNAL RESPONSECODE IFDHCloseChannel(DWORD);
-	EXTERNAL RESPONSECODE IFDHGetCapabilities(DWORD, DWORD, PDWORD, PUCHAR);
-	EXTERNAL RESPONSECODE IFDHSetCapabilities(DWORD, DWORD, DWORD, PUCHAR);
-	EXTERNAL RESPONSECODE IFDHSetProtocolParameters(DWORD, DWORD, UCHAR,
+	RESPONSECODE IFDHCreateChannel(DWORD, DWORD);
+	RESPONSECODE IFDHCloseChannel(DWORD);
+	RESPONSECODE IFDHGetCapabilities(DWORD, DWORD, PDWORD, PUCHAR);
+	RESPONSECODE IFDHSetCapabilities(DWORD, DWORD, DWORD, PUCHAR);
+	RESPONSECODE IFDHSetProtocolParameters(DWORD, DWORD, UCHAR,
 		UCHAR, UCHAR, UCHAR);
-	EXTERNAL RESPONSECODE IFDHPowerICC(DWORD, DWORD, PUCHAR, PDWORD);
-	EXTERNAL RESPONSECODE IFDHTransmitToICC(DWORD, SCARD_IO_HEADER, PUCHAR,
+	RESPONSECODE IFDHPowerICC(DWORD, DWORD, PUCHAR, PDWORD);
+	RESPONSECODE IFDHTransmitToICC(DWORD, SCARD_IO_HEADER, PUCHAR,
 		DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER);
-	EXTERNAL RESPONSECODE IFDHICCPresence(DWORD);
+	RESPONSECODE IFDHICCPresence(DWORD);
 
 	/*
 	 * List of Defined Functions Available to IFD_Handler 1.0 
 	 */
 
-	EXTERNAL RESPONSECODE IO_Create_Channel(DWORD);
-	EXTERNAL RESPONSECODE IO_Close_Channel();
-	EXTERNAL RESPONSECODE IFD_Get_Capabilities(DWORD, PUCHAR);
-	EXTERNAL RESPONSECODE IFD_Set_Capabilities(DWORD, PUCHAR);
-	EXTERNAL RESPONSECODE IFD_Set_Protocol_Parameters(DWORD, UCHAR, UCHAR,
+	RESPONSECODE IO_Create_Channel(DWORD);
+	RESPONSECODE IO_Close_Channel();
+	RESPONSECODE IFD_Get_Capabilities(DWORD, PUCHAR);
+	RESPONSECODE IFD_Set_Capabilities(DWORD, PUCHAR);
+	RESPONSECODE IFD_Set_Protocol_Parameters(DWORD, UCHAR, UCHAR,
 		UCHAR, UCHAR);
-	EXTERNAL RESPONSECODE IFD_Power_ICC(DWORD);
-	EXTERNAL RESPONSECODE IFD_Swallow_ICC();
-	EXTERNAL RESPONSECODE IFD_Eject_ICC();
-	EXTERNAL RESPONSECODE IFD_Confiscate_ICC();
-	EXTERNAL RESPONSECODE IFD_Transmit_to_ICC(SCARD_IO_HEADER, PUCHAR, DWORD,
+	RESPONSECODE IFD_Power_ICC(DWORD);
+	RESPONSECODE IFD_Swallow_ICC();
+	RESPONSECODE IFD_Eject_ICC();
+	RESPONSECODE IFD_Confiscate_ICC();
+	RESPONSECODE IFD_Transmit_to_ICC(SCARD_IO_HEADER, PUCHAR, DWORD,
 		PUCHAR, PDWORD, PSCARD_IO_HEADER);
-	EXTERNAL RESPONSECODE IFD_Is_ICC_Present();
-	EXTERNAL RESPONSECODE IFD_Is_ICC_Absent();
+	RESPONSECODE IFD_Is_ICC_Present();
+	RESPONSECODE IFD_Is_ICC_Absent();
 
 #ifdef __cplusplus
 }