CVS: rdesktop xwin.c,1.219,1.220

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

Modified Files:
	xwin.c 
Log Message:
allow inclusion of Xproto.h by renaming their BOOL to XPROTO_BOOL


Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -C2 -d -r1.219 -r1.220
*** xwin.c	4 Jan 2007 05:39:39 -0000	1.219
--- xwin.c	4 Jan 2007 23:38:35 -0000	1.220
***************
*** 21,24 ****
--- 21,27 ----
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
+ #define BOOL XPROTO_BOOL
+ #include <X11/Xproto.h>
+ #undef BOOL
  #include <unistd.h>
  #include <sys/time.h>
***************
*** 29,35 ****
  #include "xproto.h"
  
- /* We can't include Xproto.h because of conflicting defines for BOOL */
- #define X_ConfigureWindow              12
- 
  extern int g_width;
  extern int g_height;
--- 32,35 ----


-------------------------------------------------------------------------
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