xserver: Branch 'master'

[Keith Packard]

 include/screenint.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 83df169538bddcf3a61e2c5e02a4f3e10af93b60
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jul 20 00:59:20 2012 -0700

    dix: don't use "new" as a parameter name
    
    "new" is a reserved word in C++.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/screenint.h b/include/screenint.h
index e36b4d8..e61cd33 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -72,18 +72,18 @@ extern _X_EXPORT int AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
 extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT void
-AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr new);
+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 extern _X_EXPORT void
 DetachUnboundGPU(ScreenPtr unbound);
 
 extern _X_EXPORT void
-AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new);
+AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 
 extern _X_EXPORT void
 DetachOutputGPU(ScreenPtr output);
 
 extern _X_EXPORT void
-AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new);
+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 
 extern _X_EXPORT void
 DetachOffloadGPU(ScreenPtr slave);