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

1 files changed, 39 insertions, 40 deletions

diff --git a/xorg-server/hw/xwin/winmultiwindowclass.h b/xorg-server/hw/xwin/winmultiwindowclass.h
index c635ab20b..419602154 100644
--- a/xorg-server/hw/xwin/winmultiwindowclass.h
+++ b/xorg-server/hw/xwin/winmultiwindowclass.h
@@ -35,16 +35,16 @@
  */
 
 typedef struct {
-  long		flags;	/* marks which fields in this structure are defined */
-  Bool		input;	/* does this application rely on the window manager to
-		   get keyboard input? */
-  int		initial_state;	/* see below */
-  Pixmap	icon_pixmap;	/* pixmap to be used as icon */
-  Window	icon_window; 	/* window to be used as icon */
-  int		icon_x, icon_y; 	/* initial position of icon */
-  Pixmap	icon_mask;	/* icon mask bitmap */
-  XID		window_group;	/* id of related window group */
-  /* this structure may be extended in the future */
+    long flags;                 /* marks which fields in this structure are defined */
+    Bool input;                 /* does this application rely on the window manager to
+                                   get keyboard input? */
+    int initial_state;          /* see below */
+    Pixmap icon_pixmap;         /* pixmap to be used as icon */
+    Window icon_window;         /* window to be used as icon */
+    int icon_x, icon_y;         /* initial position of icon */
+    Pixmap icon_mask;           /* icon mask bitmap */
+    XID window_group;           /* id of related window group */
+    /* this structure may be extended in the future */
 } WinXWMHints;
 
 
@@ -53,18 +53,18 @@ typedef struct {
  * used with WM_NORMAL_HINTS.
  */
 typedef struct {
-  long flags;     /* marks which fields in this structure are defined */
-  int x, y;               /* obsolete for new window mgrs, but clients */
-  int width, height;      /* should set so old wm's don't mess up */
-  int min_width, min_height;
-  int max_width, max_height;
-  int width_inc, height_inc;
-  struct {
-    int x;  /* numerator */
-    int y;  /* denominator */
-  } min_aspect, max_aspect;
-  int base_width, base_height;            /* added by ICCCM version 1 */
-  int win_gravity;                        /* added by ICCCM version 1 */
+    long flags;                 /* marks which fields in this structure are defined */
+    int x, y;                   /* obsolete for new window mgrs, but clients */
+    int width, height;          /* should set so old wm's don't mess up */
+    int min_width, min_height;
+    int max_width, max_height;
+    int width_inc, height_inc;
+    struct {
+        int x;                  /* numerator */
+        int y;                  /* denominator */
+    } min_aspect, max_aspect;
+    int base_width, base_height;        /* added by ICCCM version 1 */
+    int win_gravity;            /* added by ICCCM version 1 */
 } WinXSizeHints;
 
 /*
@@ -73,42 +73,41 @@ typedef struct {
  */
 
 /* flags argument in size hints */
-#define USPosition      (1L << 0) /* user specified x, y */
-#define USSize          (1L << 1) /* user specified width, height */
-
-#define PPosition       (1L << 2) /* program specified position */
-#define PSize           (1L << 3) /* program specified size */
-#define PMinSize        (1L << 4) /* program specified minimum size */
-#define PMaxSize        (1L << 5) /* program specified maximum size */
-#define PResizeInc      (1L << 6) /* program specified resize increments */
-#define PAspect         (1L << 7) /* program specified min and max aspect ratios */
-#define PBaseSize       (1L << 8) /* program specified base for incrementing */
-#define PWinGravity     (1L << 9) /* program specified window gravity */
+#define USPosition      (1L << 0)       /* user specified x, y */
+#define USSize          (1L << 1)       /* user specified width, height */
+
+#define PPosition       (1L << 2)       /* program specified position */
+#define PSize           (1L << 3)       /* program specified size */
+#define PMinSize        (1L << 4)       /* program specified minimum size */
+#define PMaxSize        (1L << 5)       /* program specified maximum size */
+#define PResizeInc      (1L << 6)       /* program specified resize increments */
+#define PAspect         (1L << 7)       /* program specified min and max aspect ratios */
+#define PBaseSize       (1L << 8)       /* program specified base for incrementing */
+#define PWinGravity     (1L << 9)       /* program specified window gravity */
 
 /* obsolete */
 #define PAllHints (PPosition|PSize|PMinSize|PMaxSize|PResizeInc|PAspect)
 
-
 /*
  * Function prototypes
  */
 
 int
-winMultiWindowGetWMHints (WindowPtr pWin, WinXWMHints *hints);
+ winMultiWindowGetWMHints(WindowPtr pWin, WinXWMHints * hints);
 
 int
-winMultiWindowGetClassHint (WindowPtr pWin, char **res_name, char **res_class);
+ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class);
 
 int
-winMultiWindowGetWindowRole (WindowPtr pWin, char **res_role);
+ winMultiWindowGetWindowRole(WindowPtr pWin, char **res_role);
 
 int
-winMultiWindowGetWMNormalHints (WindowPtr pWin, WinXSizeHints *hints);
+ winMultiWindowGetWMNormalHints(WindowPtr pWin, WinXSizeHints * hints);
 
 int
-winMultiWindowGetWMName (WindowPtr pWin, char **wmName);
+ winMultiWindowGetWMName(WindowPtr pWin, char **wmName);
 
 int
-winMultiWindowGetTransientFor (WindowPtr pWin, WindowPtr *ppDaddy);
+ winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy);
 
 #endif