Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/securitysrv.h
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_size_get.c
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winglobals.h
	xorg-server/hw/xwin/winmonitors.h
	xorg-server/include/closestr.h
	xorg-server/include/pixmapstr.h
	xorg-server/include/servermd.h
	xorg-server/include/site.h
	xorg-server/include/windowstr.h
	xorg-server/include/xkbstr.h

1 files changed, 52 insertions, 51 deletions

diff --git a/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h b/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
index 76e714b32..062b2eb7c 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -1,51 +1,52 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#ifndef _XF86CURSORPRIV_H

-#define _XF86CURSORPRIV_H

-

-#include "xf86Cursor.h"

-#include "mipointrst.h"

-

-typedef struct {

-    Bool			SWCursor;

-    Bool			isUp;

-    Bool			showTransparent;

-    short			HotX;

-    short			HotY;

-    short			x;

-    short			y;

-    CursorPtr			CurrentCursor, CursorToRestore;

-    xf86CursorInfoPtr		CursorInfoPtr;

-    CloseScreenProcPtr          CloseScreen;

-    RecolorCursorProcPtr	RecolorCursor;

-    InstallColormapProcPtr	InstallColormap;

-    QueryBestSizeProcPtr	QueryBestSize;

-    miPointerSpriteFuncPtr	spriteFuncs;

-    Bool			PalettedCursor;

-    ColormapPtr			pInstalledMap;

-    Bool                	(*SwitchMode)(int, DisplayModePtr,int);

-    xf86EnableDisableFBAccessProc *EnableDisableFBAccess;

-    CursorPtr                   SavedCursor;

-

-    /* Number of requests to force HW cursor */

-    int				ForceHWCursorCount;

-    Bool			HWCursorForced;

-

-    pointer			transparentData;

-} xf86CursorScreenRec, *xf86CursorScreenPtr;

-

-void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);

-void xf86SetTransparentCursor(ScreenPtr pScreen);

-void xf86MoveCursor(ScreenPtr pScreen, int x, int y);

-void xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed);

-Bool xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr);

-

-CARD32 xf86ReverseBitOrder(CARD32 data);

-

-extern _X_EXPORT DevPrivateKeyRec xf86CursorScreenKeyRec;

-#define xf86CursorScreenKey (&xf86CursorScreenKeyRec)

-

-#endif /* _XF86CURSORPRIV_H */

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#ifndef _XF86CURSORPRIV_H
+#define _XF86CURSORPRIV_H
+
+#include "xf86Cursor.h"
+#include "mipointrst.h"
+
+typedef struct {
+    Bool SWCursor;
+    Bool isUp;
+    Bool showTransparent;
+    short HotX;
+    short HotY;
+    short x;
+    short y;
+    CursorPtr CurrentCursor, CursorToRestore;
+    xf86CursorInfoPtr CursorInfoPtr;
+    CloseScreenProcPtr CloseScreen;
+    RecolorCursorProcPtr RecolorCursor;
+    InstallColormapProcPtr InstallColormap;
+    QueryBestSizeProcPtr QueryBestSize;
+    miPointerSpriteFuncPtr spriteFuncs;
+    Bool PalettedCursor;
+    ColormapPtr pInstalledMap;
+    Bool (*SwitchMode) (int, DisplayModePtr, int);
+    xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
+    CursorPtr SavedCursor;
+
+    /* Number of requests to force HW cursor */
+    int ForceHWCursorCount;
+    Bool HWCursorForced;
+
+    pointer transparentData;
+} xf86CursorScreenRec, *xf86CursorScreenPtr;
+
+void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);
+void xf86SetTransparentCursor(ScreenPtr pScreen);
+void xf86MoveCursor(ScreenPtr pScreen, int x, int y);
+void xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed);
+Bool xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr);
+
+CARD32 xf86ReverseBitOrder(CARD32 data);
+
+extern _X_EXPORT DevPrivateKeyRec xf86CursorScreenKeyRec;
+
+#define xf86CursorScreenKey (&xf86CursorScreenKeyRec)
+
+#endif                          /* _XF86CURSORPRIV_H */