x11proto: Changes to 'master'

[Jon TURNEY]

 Xwindows.h |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri Jun 5 18:04:58 2009 +0100

    Cygwin/X: Don't destroy min/max macros in Xwindows.h
    
    Now that macros named min/max rather than MIN/MAX are used consistently in the
    X server, we need to ensure they work for Xwin builds.  Change Xwindows.h from
    simply destroying any definition of min/max, to avoiding defining them but
    allowing any pre-existing definition to stand.
    
    Also, try to improve the comment describing why this madness is needed in the
    first place, and remove a no-longer needed macro definition of sleep()