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

[Ludovic Rousseau]

Author: rousseau
Date: 2006-06-06 09:20:19 +0000 (Tue, 06 Jun 2006)
New Revision: 2071

Modified:
   trunk/PCSC/src/PCSC/wintypes.h
Log:
use LPCSTR and LPSTR instead of LPCTSTR and LPTSTR.

LPCTSTR is either LPCSTR or LPCWSTR depending on the value of UNICODE
under Windows. So this type name should not be used directly.

See http://archives.neohapsis.com/archives/dev/muscle/2006-q2/0149.html


Modified: trunk/PCSC/src/PCSC/wintypes.h
===================================================================
--- trunk/PCSC/src/PCSC/wintypes.h	2006-05-30 20:21:20 UTC (rev 2070)
+++ trunk/PCSC/src/PCSC/wintypes.h	2006-06-06 09:20:19 UTC (rev 2071)
@@ -42,20 +42,26 @@
 	typedef unsigned short WORD;
 	typedef long LONG;
 	typedef long RESPONSECODE;
-	typedef const char *LPCTSTR;
+	typedef const char *LPCSTR;
 	typedef const BYTE *LPCBYTE;
 	typedef BYTE *LPBYTE;
 	typedef DWORD *LPDWORD;
-	typedef char *LPTSTR;
+	typedef char *LPSTR;
 
 	/* this type is deprecated but still used by old drivers and applications
 	 * You should use LPTSTR instead */
-	typedef char *LPSTR
+	typedef char *LPTSTR
 #ifdef __GNUC__
 		/* __attribute__ is a GCC only extension */
 		__attribute__ ((deprecated))
 #endif
 		;
+	typedef const char *LPCTSTR
+#ifdef __GNUC__
+		/* __attribute__ is a GCC only extension */
+		__attribute__ ((deprecated))
+#endif
+		;
 
 #else
 #include <windows.h>