xserver: Branch 'master'

[Keith Packard]

 fb/wfbrename.h |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 1333e101b4f6ecca72568b7f462884f8b102a5c2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Oct 7 18:17:02 2010 -0700

    Remove leftover fbSaveAreas & fbRestoreAreas defines from wfbrename.h
    
    The fb functions they try to rename were deleted in 2007 by
    commit ae7f71a8b3d6756161e55d998d6eec37d2695c98
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Tested-by: Jeremy Huddleston <jeremyhu at apple.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 433f286..c8e98c8 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -155,8 +155,6 @@
 #define fbReduceRasterOp wfbReduceRasterOp
 #define fbReplicatePixel wfbReplicatePixel
 #define fbResolveColor wfbResolveColor
-#define fbRestoreAreas wfbRestoreAreas
-#define fbSaveAreas wfbSaveAreas
 #define fbScreenPrivateKeyRec wfbScreenPrivateKeyRec
 #define fbSegment wfbSegment
 #define fbSelectBres wfbSelectBres