CVS: rdesktop types.h,1.32,1.33 scard.c,1.17,1.18

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5719

Modified Files:
	types.h scard.c 
Log Message:
ignore PCSCs idea of BOOL


Index: types.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/types.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** types.h	4 Jan 2007 05:39:39 -0000	1.32
--- types.h	4 Jan 2007 23:19:54 -0000	1.33
***************
*** 19,31 ****
  */
  
- #ifdef WITH_SCARD
- #ifdef PCSC_OSX
- #include <PCSC/wintypes.h>
- #else
- #include <wintypes.h>
- #endif /* PCSC_OSX */
- #else
  typedef int BOOL;
- #endif
  
  #ifndef True
--- 19,23 ----

Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** scard.c	4 Jan 2007 14:38:48 -0000	1.17
--- scard.c	4 Jan 2007 23:19:54 -0000	1.18
***************
*** 20,24 ****
  
  #include <stdio.h>
- #include "rdesktop.h"
  #include <unistd.h>
  #include <fcntl.h>
--- 20,23 ----
***************
*** 26,37 ****
--- 25,43 ----
  #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"
  


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV