summaryrefslogtreecommitdiff
path: root/src/mesa/main/mtypes.h
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-09-03 12:47:25 -0600
committerBrian Paul <brianp@vmware.com>2009-09-03 12:47:25 -0600
commite059885ce357dee8b847f10e8e8c515a4a20042e (patch)
treec5a0025777fe8cdf47e1b1496024de2c18724c9f /src/mesa/main/mtypes.h
parent446a71d1f81bc802b5b796d114a4bfa5cc44eaca (diff)
mesa: rename gl_sync_object::Status to StatusFlag
There's a symbol collision with X11/Xlib.h #define Status int in the Mesa xlib code. This seems the simpliest way to work around this.
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r--src/mesa/main/mtypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bd3bf28328..6b64bf8139 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1998,7 +1998,7 @@ struct gl_sync_object {
*/
GLenum SyncCondition;
GLbitfield Flags; /**< Flags passed to glFenceSync */
- GLuint Status:1; /**< Has the sync object been signaled? */
+ GLuint StatusFlag:1; /**< Has the sync object been signaled? */
};