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, 26 insertions, 43 deletions

diff --git a/xorg-server/glx/glthread.h b/xorg-server/glx/glthread.h
index 532401a73..62c9bd4f1 100644
--- a/xorg-server/glx/glthread.h
+++ b/xorg-server/glx/glthread.h
@@ -22,7 +22,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * Thread support for gl dispatch.
  *
@@ -63,14 +62,13 @@
 #ifndef GLTHREAD_H
 #define GLTHREAD_H
 
-
 #if defined(USE_MGL_NAMESPACE)
 #define _glapi_Dispatch _mglapi_Dispatch
 #endif
 
 #if (defined(PTHREADS) || defined(WIN32_THREADS)) \
     && !defined(THREADS)
-# define THREADS
+#define THREADS
 #endif
 
 #ifdef VMS
@@ -87,11 +85,11 @@
  * proper compiling for MT-safe libc etc.
  */
 #if defined(PTHREADS)
-#include <pthread.h> /* POSIX threads headers */
+#include <pthread.h>            /* POSIX threads headers */
 
 typedef struct {
-   pthread_key_t  key;
-   int initMagic;
+    pthread_key_t key;
+    int initMagic;
 } _glthread_TSD;
 
 typedef pthread_t _glthread_Thread;
@@ -113,10 +111,7 @@ typedef pthread_mutex_t _glthread_Mutex;
 #define _glthread_UNLOCK_MUTEX(name) \
    (void) pthread_mutex_unlock(&(name))
 
-#endif /* PTHREADS */
-
-
-
+#endif                          /* PTHREADS */
 
 /*
  * Solaris threads. Use only up to Solaris 2.4.
@@ -125,9 +120,6 @@ typedef pthread_mutex_t _glthread_Mutex;
  * use -D_REENTRANT if using gcc.
  */
 
-
-
-
 /*
  * Windows threads. Should work with Windows NT and 95.
  * IMPORTANT: Link with multithreaded runtime library when THREADS are
@@ -137,8 +129,8 @@ typedef pthread_mutex_t _glthread_Mutex;
 #include <windows.h>
 
 typedef struct {
-   DWORD key;
-   int   initMagic;
+    DWORD key;
+    int initMagic;
 } _glthread_TSD;
 
 typedef HANDLE _glthread_Thread;
@@ -151,7 +143,7 @@ typedef CRITICAL_SECTION _glthread_Mutex;
 #define _glthread_LOCK_MUTEX(name)  EnterCriticalSection(&name)
 #define _glthread_UNLOCK_MUTEX(name)  LeaveCriticalSection(&name)
 
-#endif /* WIN32_THREADS */
+#endif                          /* WIN32_THREADS */
 
 /*
  * BeOS threads. R5.x required.
@@ -162,16 +154,16 @@ typedef CRITICAL_SECTION _glthread_Mutex;
 #include <support/TLS.h>
 
 typedef struct {
-   int32        key;
-   int          initMagic;
+    int32 key;
+    int initMagic;
 } _glthread_TSD;
 
 typedef thread_id _glthread_Thread;
 
 /* Use Benaphore, aka speeder semaphore */
 typedef struct {
-    int32   lock;
-    sem_id  sem;
+    int32 lock;
+    sem_id sem;
 } benaphore;
 typedef benaphore _glthread_Mutex;
 
@@ -182,9 +174,7 @@ typedef benaphore _glthread_Mutex;
 									  	if (atomic_add(&(name.lock), 1) >= 1) acquire_sem(name.sem)
 #define _glthread_UNLOCK_MUTEX(name)  	if (atomic_add(&(name.lock), -1) > 1) release_sem(name.sem)
 
-#endif /* BEOS_THREADS */
-
-
+#endif                          /* BEOS_THREADS */
 
 #ifndef THREADS
 
@@ -208,44 +198,37 @@ typedef int _glthread_Mutex;
 
 #define _glthread_UNLOCK_MUTEX(name)  (void) name
 
-#endif /* THREADS */
-
-
+#endif                          /* THREADS */
 
 /*
  * Platform independent thread specific data API.
  */
 
 extern unsigned long
-_glthread_GetID(void);
-
+ _glthread_GetID(void);
 
 extern void
-_glthread_InitTSD(_glthread_TSD *);
-
-
-extern void *
-_glthread_GetTSD(_glthread_TSD *);
+ _glthread_InitTSD(_glthread_TSD *);
 
+extern void *_glthread_GetTSD(_glthread_TSD *);
 
 extern void
-_glthread_SetTSD(_glthread_TSD *, void *);
+ _glthread_SetTSD(_glthread_TSD *, void *);
 
 #if defined(GLX_USE_TLS)
 
-extern TLS struct _glapi_table * _glapi_tls_Dispatch;
+extern TLS struct _glapi_table *_glapi_tls_Dispatch;
 
 #define GET_DISPATCH() _glapi_tls_Dispatch
 
 #elif !defined(GL_CALL)
-# if defined(THREADS)
-#  define GET_DISPATCH() \
+#if defined(THREADS)
+#define GET_DISPATCH() \
    ((__builtin_expect( _glapi_Dispatch != NULL, 1 )) \
        ? _glapi_Dispatch : _glapi_get_dispatch())
-# else
-#  define GET_DISPATCH() _glapi_Dispatch
-# endif /* defined(THREADS) */
-#endif  /* ndef GL_CALL */
-
+#else
+#define GET_DISPATCH() _glapi_Dispatch
+#endif                          /* defined(THREADS) */
+#endif                          /* ndef GL_CALL */
 
-#endif /* THREADS_H */
+#endif                          /* THREADS_H */