Rename struct field 'private' to 'priv'.

This broke the LLVM build because 'private' is a C++ keyword.

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 480350492f1a41e4c0b0740f7dcffeebffbaafa8..c033f2a592cbdc4811091d82b57296bc1425f06c 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -212,7 +212,7 @@ intelCreateContext(const __GLcontextModes * visual,
       }
    }
 
-   pipe->private = intel;
+   pipe->priv = intel;
 
    intel->st = st_create_context(pipe, visual, st_share);
 

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 3962c0fa6d8c296310da43bb4b30172e14169d07..48356bd0e643a5b6df19ad23787985377228f937 100644 (file)
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -43,7 +43,7 @@ struct pipe_state_cache;
 struct pipe_context {
    struct pipe_winsys *winsys;
 
-   void *private;  /** context private data (for DRI for example) */
+   void *priv;  /** context private data (for DRI for example) */
 
    void (*destroy)( struct pipe_context * );
 

diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 39a9f29bca8be6ea5f60efa04c18cb7e9decba9b..95149a32006bb70c2e24e97ecd1f99a992d8dae5 100644 (file)
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -72,7 +72,7 @@ void st_flush( struct st_context *st, uint pipeFlushFlags )
       /* Hook for copying "fake" frontbuffer if necessary:
        */
       st->pipe->winsys->flush_frontbuffer( st->pipe->winsys, front_surf,
-                                           st->pipe->private );
+                                           st->pipe->priv );
       st->flags.frontbuffer_dirty = 0;
    }
 }