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

2 files changed, 118 insertions, 118 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c
index 15220d743..0ee51de2f 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -1,103 +1,103 @@
-/*

- * Derived from VTsw_usl.c which is

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

- * by S_ren Schmidt (sos@login.dkuug.dk)

- *

- * 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 bsd, 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)

-{

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

-		xf86Info.vtRequestsPending = TRUE;

-	}	

-#endif

-	return;

-}

-

-Bool

-xf86VTSwitchPending()

-{

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

-		return xf86Info.vtRequestsPending ? TRUE : FALSE;

-	}

-#endif

-	return FALSE;

-}

-

-Bool

-xf86VTSwitchAway()

-{

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

-		xf86Info.vtRequestsPending = FALSE;

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

-			return FALSE;

-		else

-			return TRUE;

-	}

-#endif

-	return FALSE;

-}

-

-Bool

-xf86VTSwitchTo()

-{

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

-		xf86Info.vtRequestsPending = FALSE;

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

-			return FALSE;

-		else

-			return TRUE;

-	}

-#endif

-	return TRUE;

-}

-

-Bool

-xf86VTActivate(int vtno)

-{

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

-		return FALSE;

-	}

-	return TRUE;

-}

+/*
+ * Derived from VTsw_usl.c which is
+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>
+ * by S_ren Schmidt (sos@login.dkuug.dk)
+ *
+ * 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 bsd, 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)
+{
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+        xf86Info.vtRequestsPending = TRUE;
+    }
+#endif
+    return;
+}
+
+Bool
+xf86VTSwitchPending()
+{
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+        return xf86Info.vtRequestsPending ? TRUE : FALSE;
+    }
+#endif
+    return FALSE;
+}
+
+Bool
+xf86VTSwitchAway()
+{
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+        xf86Info.vtRequestsPending = FALSE;
+        if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
+            return FALSE;
+        else
+            return TRUE;
+    }
+#endif
+    return FALSE;
+}
+
+Bool
+xf86VTSwitchTo()
+{
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+        xf86Info.vtRequestsPending = FALSE;
+        if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
+            return FALSE;
+        else
+            return TRUE;
+    }
+#endif
+    return TRUE;
+}
+
+Bool
+xf86VTActivate(int vtno)
+{
+    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) {
+        return FALSE;
+    }
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_ev56.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_ev56.c
index 31b364df3..645377ed6 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_ev56.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_ev56.c
@@ -26,74 +26,74 @@ int readDense8(pointer Base, register unsigned long Offset);
 int readDense16(pointer Base, register unsigned long Offset);
 int readDense32(pointer Base, register unsigned long Offset);
 void
-writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
 void
-writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
 void
-writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
 void
-writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, pointer Base, register unsigned long Offset);
 void
-writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, pointer Base, register unsigned long Offset);
 void
-writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, pointer Base, register unsigned long Offset);
 
 int
 readDense8(pointer Base, register unsigned long Offset)
 {
     mem_barrier();
-    return (alpha_ldbu((pointer)((unsigned long)Base+(Offset))));
+    return (alpha_ldbu((pointer) ((unsigned long) Base + (Offset))));
 }
 
 int
 readDense16(pointer Base, register unsigned long Offset)
 {
     mem_barrier();
-    return (alpha_ldwu((pointer)((unsigned long)Base+(Offset))));
+    return (alpha_ldwu((pointer) ((unsigned long) Base + (Offset))));
 }
 
 int
 readDense32(pointer Base, register unsigned long Offset)
 {
     mem_barrier();
-    return *(volatile CARD32*)((unsigned long)Base+(Offset));
+    return *(volatile CARD32 *) ((unsigned long) Base + (Offset));
 }
 
 void
 writeDenseNB8(int Value, pointer Base, register unsigned long Offset)
 {
-    alpha_stb((pointer)((unsigned long)Base+(Offset)), Value);
+    alpha_stb((pointer) ((unsigned long) Base + (Offset)), Value);
 }
 
 void
 writeDenseNB16(int Value, pointer Base, register unsigned long Offset)
 {
-    alpha_stw((pointer)((unsigned long)Base + (Offset)), Value);
+    alpha_stw((pointer) ((unsigned long) Base + (Offset)), Value);
 }
 
 void
 writeDenseNB32(int Value, pointer Base, register unsigned long Offset)
 {
-    *(volatile CARD32*)((unsigned long)Base+(Offset)) = Value;
+    *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value;
 }
 
 void
 writeDense8(int Value, pointer Base, register unsigned long Offset)
 {
     write_mem_barrier();
-    alpha_stb((pointer)((unsigned long)Base+(Offset)), Value);
+    alpha_stb((pointer) ((unsigned long) Base + (Offset)), Value);
 }
 
 void
 writeDense16(int Value, pointer Base, register unsigned long Offset)
 {
     write_mem_barrier();
-    alpha_stw((pointer)((unsigned long)Base + (Offset)), Value);
+    alpha_stw((pointer) ((unsigned long) Base + (Offset)), Value);
 }
 
 void
 writeDense32(int Value, pointer Base, register unsigned long Offset)
 {
     write_mem_barrier();
-    *(volatile CARD32 *)((unsigned long)Base+(Offset)) = Value;
+    *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value;
 }