diff -up rdesktop-1.6.0/scard.c.pcsc rdesktop-1.6.0/scard.c
--- rdesktop-1.6.0/scard.c.pcsc	2008-02-14 12:37:18.000000000 +0100
+++ rdesktop-1.6.0/scard.c	2010-11-17 17:51:40.000000000 +0100
@@ -40,7 +40,6 @@
 /* variable segment */
 
 #define SCARD_MAX_MEM 102400
-#define SCARD_AUTOALLOCATE -1
 #define	OUT_STREAM_SIZE	4096
 
 #ifdef B_ENDIAN
diff -up rdesktop-1.6.0/scard.h.pcsc rdesktop-1.6.0/scard.h
--- rdesktop-1.6.0/scard.h.pcsc	2007-10-30 14:09:37.000000000 +0100
+++ rdesktop-1.6.0/scard.h	2010-11-17 17:44:19.000000000 +0100
@@ -51,8 +51,8 @@ typedef SCARDHANDLE MYPCSC_SCARDHANDLE;
 typedef uint32_t SERVER_SCARDCONTEXT;
 typedef uint32_t SERVER_SCARDHANDLE;
 
-typedef SCARD_READERSTATE_A MYPCSC_SCARD_READERSTATE_A;
-typedef LPSCARD_READERSTATE_A MYPCSC_LPSCARD_READERSTATE_A;
+typedef SCARD_READERSTATE MYPCSC_SCARD_READERSTATE_A;
+typedef LPSCARD_READERSTATE MYPCSC_LPSCARD_READERSTATE_A;
 
 typedef struct
 {