Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 65 insertions, 79 deletions

diff --git a/xorg-server/glx/glthread.c b/xorg-server/glx/glthread.c
index 5da7e433c..fd4c6cc09 100644
--- a/xorg-server/glx/glthread.c
+++ b/xorg-server/glx/glthread.c
@@ -22,13 +22,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * XXX There's probably some work to do in order to make this file
  * truly reusable outside of Mesa.
  */
 
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #include <X11/Xfuncproto.h>
@@ -38,7 +36,6 @@
 #include <stdio.h>
 #include "glthread.h"
 
-
 /*
  * This file should still compile even when THREADS is not defined.
  * This is to make things easier to deal with on the makefile scene..
@@ -53,7 +50,6 @@
 #define GET_TSD_ERROR "_glthread_: failed to get thread specific data"
 #define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"
 
-
 /*
  * Magic number to determine if a TSD object has been initialized.
  * Kind of a hack but there doesn't appear to be a better cross-platform
@@ -61,8 +57,6 @@
  */
 #define INIT_MAGIC 0xff8adc98
 
-
-
 /*
  * POSIX Threads -- The best way to go if your platform supports them.
  *                  Solaris >= 2.5 have POSIX threads, IRIX >= 6.4 reportedly
@@ -75,44 +69,41 @@
 _X_EXPORT unsigned long
 _glthread_GetID(void)
 {
-   return (unsigned long) pthread_self();
+    return (unsigned long) pthread_self();
 }
 
-
 void
-_glthread_InitTSD(_glthread_TSD *tsd)
+_glthread_InitTSD(_glthread_TSD * tsd)
 {
-   if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
-      perror(INIT_TSD_ERROR);
-      exit(-1);
-   }
-   tsd->initMagic = INIT_MAGIC;
+    if (pthread_key_create(&tsd->key, NULL /*free */ ) != 0) {
+        perror(INIT_TSD_ERROR);
+        exit(-1);
+    }
+    tsd->initMagic = INIT_MAGIC;
 }
 
-
 void *
-_glthread_GetTSD(_glthread_TSD *tsd)
+_glthread_GetTSD(_glthread_TSD * tsd)
 {
-   if (tsd->initMagic != (int) INIT_MAGIC) {
-      _glthread_InitTSD(tsd);
-   }
-   return pthread_getspecific(tsd->key);
+    if (tsd->initMagic != (int) INIT_MAGIC) {
+        _glthread_InitTSD(tsd);
+    }
+    return pthread_getspecific(tsd->key);
 }
 
-
 void
-_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+_glthread_SetTSD(_glthread_TSD * tsd, void *ptr)
 {
-   if (tsd->initMagic != (int) INIT_MAGIC) {
-      _glthread_InitTSD(tsd);
-   }
-   if (pthread_setspecific(tsd->key, ptr) != 0) {
-      perror(SET_TSD_ERROR);
-      exit(-1);
-   }
+    if (tsd->initMagic != (int) INIT_MAGIC) {
+        _glthread_InitTSD(tsd);
+    }
+    if (pthread_setspecific(tsd->key, ptr) != 0) {
+        perror(SET_TSD_ERROR);
+        exit(-1);
+    }
 }
 
-#endif /* PTHREADS */
+#endif                          /* PTHREADS */
 
 /*
  * Win32 Threads.  The only available option for Windows 95/NT.
@@ -121,65 +112,64 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
  */
 #ifdef WIN32_THREADS
 
-void FreeTSD(_glthread_TSD *p)
+void
+FreeTSD(_glthread_TSD * p)
 {
-   if (p->initMagic==INIT_MAGIC) {
-      TlsFree(p->key);
-      p->initMagic=0;
-   }
+    if (p->initMagic == INIT_MAGIC) {
+        TlsFree(p->key);
+        p->initMagic = 0;
+    }
 }
 
-void InsteadOf_exit(int nCode)
+void
+InsteadOf_exit(int nCode)
 {
-   DWORD dwErr=GetLastError();
+    DWORD dwErr = GetLastError();
 }
 
 unsigned long
 _glthread_GetID(void)
 {
-   return GetCurrentThreadId();
+    return GetCurrentThreadId();
 }
 
-
 void
-_glthread_InitTSD(_glthread_TSD *tsd)
+_glthread_InitTSD(_glthread_TSD * tsd)
 {
-   tsd->key = TlsAlloc();
-   if (tsd->key == TLS_OUT_OF_INDEXES) {
-      perror("Mesa:_glthread_InitTSD");
-      InsteadOf_exit(-1);
-   }
-   tsd->initMagic = INIT_MAGIC;
+    tsd->key = TlsAlloc();
+    if (tsd->key == TLS_OUT_OF_INDEXES) {
+        perror("Mesa:_glthread_InitTSD");
+        InsteadOf_exit(-1);
+    }
+    tsd->initMagic = INIT_MAGIC;
 }
 
-
 void *
-_glthread_GetTSD(_glthread_TSD *tsd)
+_glthread_GetTSD(_glthread_TSD * tsd)
 {
-   if (tsd->initMagic != INIT_MAGIC) {
-      _glthread_InitTSD(tsd);
-   }
-   return TlsGetValue(tsd->key);
+    if (tsd->initMagic != INIT_MAGIC) {
+        _glthread_InitTSD(tsd);
+    }
+    return TlsGetValue(tsd->key);
 }
 
-
 void
-_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+_glthread_SetTSD(_glthread_TSD * tsd, void *ptr)
 {
-   /* the following code assumes that the _glthread_TSD has been initialized
-      to zero at creation */
-   if (tsd->initMagic != INIT_MAGIC) {
-      _glthread_InitTSD(tsd);
-   }
-   if (TlsSetValue(tsd->key, ptr) == 0) {
-	  perror("Mesa:_glthread_SetTSD");
-	  InsteadOf_exit(-1);
-   }
+    /* the following code assumes that the _glthread_TSD has been initialized
+       to zero at creation */
+    if (tsd->initMagic != INIT_MAGIC) {
+        _glthread_InitTSD(tsd);
+    }
+    if (TlsSetValue(tsd->key, ptr) == 0) {
+        perror("Mesa:_glthread_SetTSD");
+        InsteadOf_exit(-1);
+    }
 }
 
-#endif /* WIN32_THREADS */
+#endif                          /* WIN32_THREADS */
 
-#else  /* THREADS */
+#else                           /* THREADS */
 
 /*
  * no-op functions
@@ -188,31 +178,27 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
 _X_EXPORT unsigned long
 _glthread_GetID(void)
 {
-   return 0;
+    return 0;
 }
 
-
 void
-_glthread_InitTSD(_glthread_TSD *tsd)
+_glthread_InitTSD(_glthread_TSD * tsd)
 {
-   (void) tsd;
+    (void) tsd;
 }
 
-
 void *
-_glthread_GetTSD(_glthread_TSD *tsd)
+_glthread_GetTSD(_glthread_TSD * tsd)
 {
-   (void) tsd;
-   return NULL;
+    (void) tsd;
+    return NULL;
 }
 
-
 void
-_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+_glthread_SetTSD(_glthread_TSD * tsd, void *ptr)
 {
-   (void) tsd;
-   (void) ptr;
+    (void) tsd;
+    (void) ptr;
 }
 
-
-#endif /* THREADS */
+#endif                          /* THREADS */