--- src/libchipcard/engine/reader/ctdriver_pcsc.h
+++ src/libchipcard/engine/reader/ctdriver_pcsc.h
@@ -45,11 +45,11 @@
 					   LPSCARDCONTEXT phContext);
 typedef LONG (*CTDPCSCRELEASECONTEXTPTR)(SCARDCONTEXT hContext);
 typedef LONG (*CTDPCSCLISTREADERSPTR)(SCARDCONTEXT hContext,
-				      LPCSTR mszGroups,
-				      LPSTR mszReaders,
+				      LPTSTR mszGroups,
+				      LPTSTR mszReaders,
 				      LPDWORD pcchReaders);
 typedef LONG (*CTDPCSCCONNECTPTR)(SCARDCONTEXT hContext,
-				  LPCSTR szReader,
+				  LPCTSTR szReader,
 				  DWORD dwShareMode,
 				  DWORD dwPreferredProtocols,
 				  LPSCARDHANDLE phCard,
@@ -74,7 +74,7 @@
 				   LPBYTE pbRecvBuffer,
 				   LPDWORD pcbRecvLength);
 typedef LONG (*CTDPCSCSTATUSPTR)(SCARDHANDLE hCard,
-				 LPSTR szReaderName,
+				  LPTSTR szReaderName,
 				 LPDWORD pcchReaderLen,
 				 LPDWORD pdwState,
 				 LPDWORD pdwProtocol,
--- src/libchipcard/cards/hbcicard.cpp.orig	2005-04-11 11:04:05.346767425 +0200
+++ src/libchipcard/cards/hbcicard.cpp	2005-04-11 11:06:11.434123511 +0200
@@ -685,7 +685,7 @@ bool HBCICard::hash2MAC(string &hash, st
     return _hash2mac1(hash,mac);
   default:
     DBG_INFO("LIBCHIPCARD: unknown chip card type (%8x) (%d).",
-	     (unsigned int)this,
+	     (unsigned int)(long)this,
 	    _type);
     return false;
   }