xserver: Branch 'master'

[Aaron Plattner]

 fb/wfbrename.h |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 9c47b86bd9a4633fda5fd305a09ac8623187efa0 (from 567b5bf765254a4ae9cc7711bb6acfa89a9fd61c)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Jun 7 13:57:12 2007 -0700

    Add new fb symbols to wfbrename.h.
    
    Avoids crashes when wfbComposite calls the wrong image_from_pict.

diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 8f875c8..952512e 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -184,9 +184,11 @@
 #define fbUnmapWindow wfbUnmapWindow
 #define fbUnrealizeFont wfbUnrealizeFont
 #define fbValidateGC wfbValidateGC
+#define fbWalkCompositeRegion wfbWalkCompositeRegion
 #define fbWinPrivateIndex wfbWinPrivateIndex
 #define fbZeroLine wfbZeroLine
 #define fbZeroSegment wfbZeroSegment
+#define image_from_pict wfb_image_from_pict
 #define xxScrPrivateIndex wfbxxScrPrivateIndex
 #define xxGCPrivateIndex wfbxxGCPrivateIndex
 #define xxColormapPrivateIndex wfbxxColormapPrivateIndex