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_10sco_port_update

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.

1 files changed, 2 insertions, 13 deletions

diff --git a/src/apm_cursor.c b/src/apm_cursor.c
index 4bf0f98..1ad0e82 100644
--- a/src/apm_cursor.c
+++ b/src/apm_cursor.c
@@ -1,8 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
 
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "input.h"
 #include "cursorstr.h"
@@ -84,17 +84,6 @@ int ApmHWCursorInit(ScreenPtr pScreen)
   infoPtr->ShowCursor		= ApmShowCursor;
   infoPtr->UseHWCursor		= ApmUseHWCursor;
   
-  /*ErrorF("%s %s: %s: Using hardware cursor (XAA).\n", 
-         XCONFIG_PROBED, vga256InfoRec.name, vga256InfoRec.chipset);    
-
-  if(XAACursorInfoRec.Flags & USE_HARDWARE_CURSOR) {
-    vgaHWCursor.Init = XAACursorInit;
-    vgaHWCursor.Initialized = TRUE;
-    vgaHWCursor.Restore = XAARestoreCursor;
-    vgaHWCursor.Warp = XAAWarpCursor;
-    vgaHWCursor.QueryBestSize = XAAQueryBestSize;
-  }*/
-
   /* Set up the convert table for the input cursor data */
   for (i = 0; i < 256; i++)
     ConvertTable[i] = ((~i) & 0xAA) | (i & (i >> 1) & 0x55);