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, 45 insertions, 40 deletions

diff --git a/xorg-server/hw/dmx/input/usb-other.c b/xorg-server/hw/dmx/input/usb-other.c
index d1074b8e1..f24f259c1 100644
--- a/xorg-server/hw/dmx/input/usb-other.c
+++ b/xorg-server/hw/dmx/input/usb-other.c
@@ -68,92 +68,97 @@
 /*****************************************************************************/
 
 /** Read the USB device using #usbRead. */
-void othUSBRead(DevicePtr pDev,
-                MOTIONPROC motion,
-                ENQUEUEPROC enqueue,
-                CHECKPROC checkspecial,
-                BLOCK block)
+void
+othUSBRead(DevicePtr pDev,
+           MOTIONPROC motion,
+           ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
 {
     usbRead(pDev, motion, enqueue, 0xffff, block);
 }
 
 /** Initialize \a pDev using #usbInit. */
-void othUSBInit(DevicePtr pDev)
+void
+othUSBInit(DevicePtr pDev)
 {
     usbInit(pDev, usbOther);
 }
 
 /** Turn \a pDev on (i.e., take input from \a pDev). */
-int othUSBOn(DevicePtr pDev)
+int
+othUSBOn(DevicePtr pDev)
 {
     GETPRIV;
 
-    if (priv->fd < 0) othUSBInit(pDev);
+    if (priv->fd < 0)
+        othUSBInit(pDev);
     return priv->fd;
 }
 
 /** Fill the \a info structure with information needed to initialize \a
- * pDev. */ 
-void othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+ * pDev. */
+void
+othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
 {
     GETPRIV;
-    int           i, j;
+    int i, j;
     static KeySym keyboard_mapping = NoSymbol;
-    int           absolute[5];
-    
+    int absolute[5];
+
 #define test_bit(bit) (priv->mask[(bit)/8] & (1 << ((bit)%8)))
 
-                                /* Some USB mice devices return key
-                                 * events from their pair'd
-                                 * keyboard...  */
-    info->keyClass           = 1;
+    /* Some USB mice devices return key
+     * events from their pair'd
+     * keyboard...  */
+    info->keyClass = 1;
     info->keySyms.minKeyCode = 8;
     info->keySyms.maxKeyCode = 8;
-    info->keySyms.mapWidth   = 1;
-    info->keySyms.map        = &keyboard_mapping;
+    info->keySyms.mapWidth = 1;
+    info->keySyms.map = &keyboard_mapping;
 
     for (i = 0; i < EV_MAX; i++) {
         if (test_bit(i)) {
             switch (i) {
             case EV_KEY:
-                                /* See above */
+                /* See above */
                 break;
             case EV_REL:
-                info->valuatorClass      = 1;
+                info->valuatorClass = 1;
                 if (info->numRelAxes + info->numAbsAxes > DMX_MAX_AXES - 1) {
-                    info->numRelAxes     = DMX_MAX_AXES - info->numAbsAxes - 1;
+                    info->numRelAxes = DMX_MAX_AXES - info->numAbsAxes - 1;
                     dmxLog(dmxWarning, "Can only use %d relative axes\n",
                            info->numRelAxes);
-                } else
-                    info->numRelAxes     = priv->numRel;
-                info->minval[0]          = 0;
-                info->maxval[0]          = 0;
-                info->res[0]             = 1;
-                info->minres[0]          = 0;
-                info->maxres[0]          = 1;
+                }
+                else
+                    info->numRelAxes = priv->numRel;
+                info->minval[0] = 0;
+                info->maxval[0] = 0;
+                info->res[0] = 1;
+                info->minres[0] = 0;
+                info->maxres[0] = 1;
                 break;
             case EV_ABS:
-                info->valuatorClass      = 1;
+                info->valuatorClass = 1;
                 if (info->numRelAxes + info->numAbsAxes > DMX_MAX_AXES - 1) {
-                    info->numAbsAxes     = DMX_MAX_AXES - info->numRelAxes - 1;
+                    info->numAbsAxes = DMX_MAX_AXES - info->numRelAxes - 1;
                     dmxLog(dmxWarning, "Can only use %d absolute axes\n",
                            info->numAbsAxes);
-                } else
-                    info->numAbsAxes     = priv->numAbs;
+                }
+                else
+                    info->numAbsAxes = priv->numAbs;
                 for (j = 0; j < info->numAbsAxes; j++) {
                     ioctl(priv->fd, EVIOCGABS(j), absolute);
-                    info->minval[1+j]    = absolute[1];
-                    info->maxval[1+j]    = absolute[2];
-                    info->res[1+j]       = absolute[3];
-                    info->minres[1+j]    = absolute[3];
-                    info->maxres[1+j]    = absolute[3];
+                    info->minval[1 + j] = absolute[1];
+                    info->maxval[1 + j] = absolute[2];
+                    info->res[1 + j] = absolute[3];
+                    info->minres[1 + j] = absolute[3];
+                    info->maxres[1 + j] = absolute[3];
                 }
                 break;
             case EV_LED:
-                info->ledFeedbackClass   = 0; /* Not supported at this time */
+                info->ledFeedbackClass = 0;     /* Not supported at this time */
                 break;
             case EV_SND:
-                info->belFeedbackClass   = 0; /* Not supported at this time */
+                info->belFeedbackClass = 0;     /* Not supported at this time */
                 break;
             }
         }