Fix includes right throughout the Xserver tree:sco_port_update-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10

change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.

2 files changed, 11 insertions, 10 deletions

diff --git a/src/i740_driver.c b/src/i740_driver.c
index 0fab940..48afa48 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -83,7 +83,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "regionstr.h"
 
 #include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 
 #include "vbe.h"
 #include "i740_dga.h"
diff --git a/src/i740_video.c b/src/i740_video.c
index be1712c..a5f060c 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -44,7 +44,7 @@
  *   12 September 2002 - Better software scaling with some averaging, giving a
  *     nicer picture.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.4 2003/04/23 21:51:37 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.5tsi Exp $ */
 
 
 /*
@@ -62,7 +62,7 @@
 #include "regionstr.h"
 
 #include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "xaa.h"
 #include "xaalocal.h"
 #include "dixstruct.h"
@@ -588,11 +588,11 @@ static FBLinearPtr I740AllocateMemory(ScrnInfoPtr pScrn, FBLinearPtr linear, int
 	return linear;
 
       if(xf86ResizeOffscreenLinear(linear, size)) {
-        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory resized to %d - %p\n", (int) size, linear);  /* ### */
+        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory resized to %d - %p\n", (int) size, (void *)linear);  /* ### */
 	return linear;
       }
 
-      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory free %p - %d < %d\n", linear, (int) linear->size, (int) size);  /* ### */
+      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory free %p - %d < %d\n", (void *)linear, (int) linear->size, (int) size);  /* ### */
       xf86FreeOffscreenLinear(linear);
     }
 
@@ -616,7 +616,7 @@ static FBLinearPtr I740AllocateMemory(ScrnInfoPtr pScrn, FBLinearPtr linear, int
       new_linear = xf86AllocateOffscreenLinear(pScreen, size, 4, 
 					       NULL, NULL, NULL);
     } 
-  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory allocated %d - %p\n", (int) size, new_linear);  /* ### */
+  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740AllocateMemory allocated %d - %p\n", (int) size, (void *)new_linear);  /* ### */
 
   return new_linear;
 }
@@ -629,6 +629,7 @@ static int I740PutImage(ScrnInfoPtr pScrn,
 			Bool sync, RegionPtr clipBoxes, pointer data
 			)
 {
+  ScreenPtr pScreen = pScrn->pScreen;
   I740Ptr pI740 = I740PTR(pScrn);
   I740PortPrivPtr pPriv = (I740PortPrivPtr)data;
   INT32 x1, x2, y1, y2;
@@ -758,11 +759,11 @@ static int I740PutImage(ScrnInfoPtr pScrn,
   }
 
   /* update cliplist */
-  if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes))
+  if(!REGION_EQUAL(pScreen, &pPriv->clip, clipBoxes))
     {
-      REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
+      REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
       /* draw these */
-      xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
+      xf86XVFillKeyHelper(pScreen, pPriv->colorKey, clipBoxes);
     }
 
   {
@@ -1216,7 +1217,7 @@ static XF86VideoAdaptorPtr I740SetupImageVideo(ScreenPtr pScreen)
   pPriv->currentBuf  = 0;
 
   /* gotta uninit this someplace */
-  REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); 
+  REGION_NULL(pScreen, &pPriv->clip);
 
   pI740->adaptor = adapt;