diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-03 12:47:25 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-03 12:47:25 -0600 |
| commit | e059885ce357dee8b847f10e8e8c515a4a20042e (patch) | |
| tree | c5a0025777fe8cdf47e1b1496024de2c18724c9f /src/mesa/drivers/dri/intel | |
| parent | 446a71d1f81bc802b5b796d114a4bfa5cc44eaca (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/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_syncobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c index d447b6a0fa2..1286fe929bc 100644 --- a/src/mesa/drivers/dri/intel/intel_syncobj.c +++ b/src/mesa/drivers/dri/intel/intel_syncobj.c @@ -94,7 +94,7 @@ static void intel_client_wait_sync(GLcontext *ctx, struct gl_sync_object *s, if (sync->bo) { drm_intel_bo_wait_rendering(sync->bo); - s->Status = 1; + s->StatusFlag = 1; drm_intel_bo_unreference(sync->bo); sync->bo = NULL; } @@ -117,7 +117,7 @@ static void intel_check_sync(GLcontext *ctx, struct gl_sync_object *s) if (sync->bo && drm_intel_bo_busy(sync->bo)) { drm_intel_bo_unreference(sync->bo); sync->bo = NULL; - s->Status = 1; + s->StatusFlag = 1; } } |