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

7 files changed, 187 insertions, 193 deletions

diff --git a/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c b/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c
index be47cd681..a75d134b4 100644
--- a/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -1,60 +1,60 @@
-/*

- * Copyright 1993 by David Wexelblat <dwex@XFree86.org>

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of David Wexelblat not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  David Wexelblat makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-/*

- * No-op functions for OSs without VTs

- */

-

-Bool

-xf86VTSwitchPending(void)

-{

-	return FALSE;

-}

-

-Bool

-xf86VTSwitchAway(void)

-{

-	return FALSE;

-}

-

-Bool

-xf86VTSwitchTo(void)

-{

-	return TRUE;

-}

-

-Bool

-xf86VTActivate(int vtno)

-{

-	return TRUE;

-}

+/*
+ * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of David Wexelblat not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  David Wexelblat makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+/*
+ * No-op functions for OSs without VTs
+ */
+
+Bool
+xf86VTSwitchPending(void)
+{
+    return FALSE;
+}
+
+Bool
+xf86VTSwitchAway(void)
+{
+    return FALSE;
+}
+
+Bool
+xf86VTSwitchTo(void)
+{
+    return TRUE;
+}
+
+Bool
+xf86VTActivate(int vtno)
+{
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c b/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c
index 769fa009c..f20106c90 100644
--- a/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -1,86 +1,86 @@
-/*

- * Copyright 1993 by David Wexelblat <dwex@XFree86.org>

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of David Wexelblat not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  David Wexelblat makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-/*

- * Handle the VT-switching interface for OSs that use USL-style ioctl()s

- * (the sysv, sco, and linux subdirs).

- */

-

-/*

- * This function is the signal handler for the VT-switching signal.  It

- * is only referenced inside the OS-support layer.

- */

-void

-xf86VTRequest(int sig)

-{

-	signal(sig, (void(*)(int))xf86VTRequest);

-	xf86Info.vtRequestsPending = TRUE;

-	return;

-}

-

-Bool

-xf86VTSwitchPending(void)

-{

-    return xf86Info.vtRequestsPending ? TRUE : FALSE;

-}

-

-Bool

-xf86VTSwitchAway(void)

-{

-	xf86Info.vtRequestsPending = FALSE;

-	if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)

-		return FALSE;

-	else

-		return TRUE;

-}

-

-Bool

-xf86VTSwitchTo(void)

-{

-	xf86Info.vtRequestsPending = FALSE;

-	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

-		return FALSE;

-	else

-		return TRUE;

-}

-

-Bool

-xf86VTActivate(int vtno)

-{

-#ifdef VT_ACTIVATE

-	if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) {

-		return FALSE;

-	}

-#endif

-	return TRUE;

-}

+/*
+ * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of David Wexelblat not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  David Wexelblat makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+/*
+ * Handle the VT-switching interface for OSs that use USL-style ioctl()s
+ * (the sysv, sco, and linux subdirs).
+ */
+
+/*
+ * This function is the signal handler for the VT-switching signal.  It
+ * is only referenced inside the OS-support layer.
+ */
+void
+xf86VTRequest(int sig)
+{
+    signal(sig, (void (*)(int)) xf86VTRequest);
+    xf86Info.vtRequestsPending = TRUE;
+    return;
+}
+
+Bool
+xf86VTSwitchPending(void)
+{
+    return xf86Info.vtRequestsPending ? TRUE : FALSE;
+}
+
+Bool
+xf86VTSwitchAway(void)
+{
+    xf86Info.vtRequestsPending = FALSE;
+    if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+Bool
+xf86VTSwitchTo(void)
+{
+    xf86Info.vtRequestsPending = FALSE;
+    if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+Bool
+xf86VTActivate(int vtno)
+{
+#ifdef VT_ACTIVATE
+    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) {
+        return FALSE;
+    }
+#endif
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c
index eda466a52..9c6ed4b8d 100644
--- a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c
@@ -43,61 +43,60 @@
 Bool
 xf86GARTCloseScreen(int screenNum)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86AgpGARTSupported()
 {
-	return FALSE;
+    return FALSE;
 }
 
 AgpInfoPtr
 xf86GetAGPInfo(int screenNum)
 {
-	return NULL;
+    return NULL;
 }
 
 Bool
 xf86AcquireGART(int screenNum)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86ReleaseGART(int screenNum)
 {
-	return FALSE;
+    return FALSE;
 }
 
 int
 xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,
-			unsigned long *physical)
+                       unsigned long *physical)
 {
-	return -1;
+    return -1;
 }
 
 Bool
 xf86DeallocateGARTMemory(int screenNum, int key)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86BindGARTMemory(int screenNum, int key, unsigned long offset)
 {
-	return FALSE;
+    return FALSE;
 }
 
-
 Bool
 xf86UnbindGARTMemory(int screenNum, int key)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 xf86EnableAGP(int screenNum, CARD32 mode)
 {
-	return FALSE;
+    return FALSE;
 }
diff --git a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c
index 805caccac..30688c0b5 100644
--- a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -38,12 +38,11 @@
 Bool
 xf86EnableIO()
 {
-	return TRUE;
+    return TRUE;
 }
 
 void
 xf86DisableIO()
 {
-	return;
+    return;
 }
-
diff --git a/xorg-server/hw/xfree86/os-support/shared/pm_noop.c b/xorg-server/hw/xfree86/os-support/shared/pm_noop.c
index bfac4b1c8..1d6f0789d 100644
--- a/xorg-server/hw/xfree86/os-support/shared/pm_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/pm_noop.c
@@ -41,7 +41,5 @@
 PMClose
 xf86OSPMOpen(void)
 {
-	return NULL;
+    return NULL;
 }
-
-
diff --git a/xorg-server/hw/xfree86/os-support/shared/sigiostubs.c b/xorg-server/hw/xfree86/os-support/shared/sigiostubs.c
index cecec37f7..ba8e234f4 100644
--- a/xorg-server/hw/xfree86/os-support/shared/sigiostubs.c
+++ b/xorg-server/hw/xfree86/os-support/shared/sigiostubs.c
@@ -29,13 +29,13 @@
 #include <xorg-config.h>
 #endif
 
-# include <X11/X.h>
-# include "xf86.h"
-# include "xf86Priv.h"
-# include "xf86_OSlib.h"
+#include <X11/X.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
 
 int
-xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
+xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
 {
     return 0;
 }
@@ -47,25 +47,24 @@ xf86RemoveSIGIOHandler(int fd)
 }
 
 int
-xf86BlockSIGIO (void)
+xf86BlockSIGIO(void)
 {
     return 0;
 }
 
 void
-xf86UnblockSIGIO (int wasset)
+xf86UnblockSIGIO(int wasset)
 {
 }
 
 void
-xf86AssertBlockedSIGIO (char *where)
+xf86AssertBlockedSIGIO(char *where)
 {
 }
 
 /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */
 Bool
-xf86SIGIOSupported ()
+xf86SIGIOSupported()
 {
     return FALSE;
 }
-
diff --git a/xorg-server/hw/xfree86/os-support/shared/xf86Axp.h b/xorg-server/hw/xfree86/os-support/shared/xf86Axp.h
index 5e9d6284c..fded9d8c9 100644
--- a/xorg-server/hw/xfree86/os-support/shared/xf86Axp.h
+++ b/xorg-server/hw/xfree86/os-support/shared/xf86Axp.h
@@ -6,29 +6,28 @@
 #define _XF86_AXP_H_
 
 typedef enum {
-  SYS_NONE,
-  TSUNAMI,
-  LCA,
-  APECS,
-  T2,
-  T2_GAMMA,
-  CIA,
-  MCPCIA,
-  JENSEN,
-  POLARIS,
-  PYXIS,
-  PYXIS_CIA,
-  IRONGATE
+    SYS_NONE,
+    TSUNAMI,
+    LCA,
+    APECS,
+    T2,
+    T2_GAMMA,
+    CIA,
+    MCPCIA,
+    JENSEN,
+    POLARIS,
+    PYXIS,
+    PYXIS_CIA,
+    IRONGATE
 } axpDevice;
-  
+
 typedef struct {
-  axpDevice id;
-  unsigned long hae_thresh;
-  unsigned long hae_mask;
-  unsigned long size;
+    axpDevice id;
+    unsigned long hae_thresh;
+    unsigned long hae_mask;
+    unsigned long size;
 } axpParams;
 
 extern axpParams xf86AXPParams[];
 
 #endif
-