From d6d3999ccb2cb72d55820770260172eccbbb68d7 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 16 Apr 2012 09:17:34 +0200
Subject: libX11 xserver pixman mesa git update 16 Apr 2012

---
 xorg-server/hw/dmx/config/Canvas.h    |  8 ++++----
 xorg-server/hw/dmx/config/CanvasP.h   | 10 +++++-----
 xorg-server/hw/dmx/config/dmxconfig.h |  4 ++--
 xorg-server/hw/dmx/config/dmxprint.h  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'xorg-server/hw/dmx/config')

diff --git a/xorg-server/hw/dmx/config/Canvas.h b/xorg-server/hw/dmx/config/Canvas.h
index fe9a57f21..d516faf93 100644
--- a/xorg-server/hw/dmx/config/Canvas.h
+++ b/xorg-server/hw/dmx/config/Canvas.h
@@ -47,9 +47,9 @@ typedef struct _CanvasRec *CanvasWidget;
 extern WidgetClass canvasWidgetClass;
 
 typedef struct _CanvasExposeDataRec {
-    Widget       w;
-    XEvent       *event;
-    Region       region;
+    Widget w;
+    XEvent *event;
+    Region region;
 } CanvasExposeDataRec, *CanvasExposeDataPtr;
 
-#endif /* _Canvas_h */
+#endif                          /* _Canvas_h */
diff --git a/xorg-server/hw/dmx/config/CanvasP.h b/xorg-server/hw/dmx/config/CanvasP.h
index cf43710f1..b1ccf2497 100644
--- a/xorg-server/hw/dmx/config/CanvasP.h
+++ b/xorg-server/hw/dmx/config/CanvasP.h
@@ -45,8 +45,8 @@ typedef struct {
 } CanvasClassPart;
 
 typedef struct _CanvasClassRec {
-    CoreClassPart	core_class;
-    CanvasClassPart	canvas_class;
+    CoreClassPart core_class;
+    CanvasClassPart canvas_class;
 } CanvasClassRec;
 
 extern CanvasClassRec canvasClassRec;
@@ -58,8 +58,8 @@ typedef struct {
 } CanvasPart;
 
 typedef struct _CanvasRec {
-    CorePart	core;
-    CanvasPart	canvas;
+    CorePart core;
+    CanvasPart canvas;
 } CanvasRec;
 
-#endif /* _CanvasP_h */
+#endif                          /* _CanvasP_h */
diff --git a/xorg-server/hw/dmx/config/dmxconfig.h b/xorg-server/hw/dmx/config/dmxconfig.h
index 91a6662e3..deb293cc0 100644
--- a/xorg-server/hw/dmx/config/dmxconfig.h
+++ b/xorg-server/hw/dmx/config/dmxconfig.h
@@ -40,8 +40,8 @@
 #include <xkb-config.h>
 
 extern void dmxConfigStoreDisplay(const char *display);
-extern void dmxConfigStoreInput(const char *input); /* Core devices */
-extern void dmxConfigStoreXInput(const char *input); /* Non-core devices */
+extern void dmxConfigStoreInput(const char *input);     /* Core devices */
+extern void dmxConfigStoreXInput(const char *input);    /* Non-core devices */
 extern void dmxConfigStoreFile(const char *file);
 extern void dmxConfigStoreConfig(const char *config);
 extern void dmxConfigConfigure(void);
diff --git a/xorg-server/hw/dmx/config/dmxprint.h b/xorg-server/hw/dmx/config/dmxprint.h
index d162dea95..d77bafce2 100644
--- a/xorg-server/hw/dmx/config/dmxprint.h
+++ b/xorg-server/hw/dmx/config/dmxprint.h
@@ -37,7 +37,7 @@
 #ifndef _DMXPRINT_H_
 #define _DMXPRINT_H_
 
-void dmxConfigPrint(FILE *str, DMXConfigEntryPtr entry);
-void dmxConfigVirtualPrint(FILE *str, DMXConfigVirtualPtr p);
+void dmxConfigPrint(FILE * str, DMXConfigEntryPtr entry);
+void dmxConfigVirtualPrint(FILE * str, DMXConfigVirtualPtr p);
 
 #endif
-- 
cgit v1.2.3