ignore PCSCs idea of BOOL

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1367 423420c4-83ab-492f-b58f-81f9feb106b5

scard.c

@@ -19,20 +19,26 @@
 */
 
 #include <stdio.h>
-#include "rdesktop.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <strings.h>
 #include <sys/types.h>
 #include <time.h>
+/* PCSC does not use BOOL as parameters or return values in function calls,
+   so let us just ignore their own definition of BOOL */
+#define BOOL PCSC_BOOL
 #ifndef MAKE_PROTO
 #ifdef PCSC_OSX
+#include <PCSC/wintypes.h>
 #include <PCSC/pcsclite.h>
 #include <PCSC/winscard.h>
 #else
+#include <wintypes.h>
 #include <pcsclite.h>
 #include <winscard.h>
 #endif /* PCSC_OSX */
+#undef BOOL
+#include "rdesktop.h"
 #include "scard.h"
 
 /* variable segment */

types.h

@@ -18,15 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef WITH_SCARD
-#ifdef PCSC_OSX
-#include <PCSC/wintypes.h>
-#else
-#include <wintypes.h>
-#endif /* PCSC_OSX */
-#else
 typedef int BOOL;
-#endif
 
 #ifndef True
 #define True  (1)