proto/randrproto: Branch 'master'

[Adam Jackson]

 randrproto.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9ab3d5cca3cf9a76c6873007b8d4345c838cc297
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 23 14:52:12 2008 -0400

    Bug #16149: Make the field not be named 'delete' in C++ mode.
    
    Thanks for the upward compatibility, Bjarne.

diff --git a/randrproto.h b/randrproto.h
index cf7a022..3fb2e45 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -376,7 +376,11 @@ typedef struct {
     Atom	type B32;
     CARD32	longOffset B32;
     CARD32	longLength B32;
+#ifdef __cplusplus
+    BOOL	_delete;
+#else
     BOOL	delete;
+#endif
     BOOL	pending;
     CARD16	pad1 B16;
 } xRRGetOutputPropertyReq;