svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 5 insertions, 6 deletions

diff --git a/xorg-server/Xext/mbufbf.c b/xorg-server/Xext/mbufbf.c
index a3b3de79d..e929ab5fd 100644
--- a/xorg-server/Xext/mbufbf.c
+++ b/xorg-server/Xext/mbufbf.c
@@ -47,6 +47,7 @@ in this Software without prior written authorization from The Open Group.
 #include "gcstruct.h"
 #include "inputstr.h"
 #include "validate.h"
+#include "globals.h"
 #include <sys/time.h>
 
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
@@ -199,8 +200,6 @@ static Bool bufChangeWindowAttributes();
 static void bufClearToBackground();
 static void bufCopyWindow();
 
-extern WindowPtr *WindowTable;
-
 static Bool
 bufMultibufferInit(pScreen, pMBScreen)
     ScreenPtr pScreen;
@@ -600,9 +599,9 @@ bufDrawSelectPlane(pScreen, selectPlane, prgn, bufferNum)
 {
     DrawablePtr pDrawable;
     GCPtr pGC;
-    register int i;
-    register BoxPtr pbox;
-    register xRectangle *prect;
+    int i;
+    BoxPtr pbox;
+    xRectangle *prect;
     int numRects;
     XID	value;
 
@@ -882,7 +881,7 @@ bufChangeWindowAttributes(pWin, mask)
 static void 
 bufWindowExposures(pWin, prgn, other_exposed)
     WindowPtr pWin;
-    register RegionPtr prgn, other_exposed;
+    RegionPtr prgn, other_exposed;
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     mbufWindowPtr pMBWindow = MB_WINDOW_PRIV(pWin);