libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 46 insertions, 46 deletions

diff --git a/xorg-server/glx/glxdricommon.h b/xorg-server/glx/glxdricommon.h
index ef7b531f6..f4fcf009e 100644
--- a/xorg-server/glx/glxdricommon.h
+++ b/xorg-server/glx/glxdricommon.h
@@ -1,46 +1,46 @@
-/*

- * Copyright © 2008 Red Hat, Inc

- *

- * Permission to use, copy, modify, distribute, and sell this software

- * and its documentation for any purpose is hereby granted without

- * fee, provided that the above copyright notice appear in all copies

- * and that both that copyright notice and this permission notice

- * appear in supporting documentation, and that the name of the

- * copyright holders not be used in advertising or publicity

- * pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no

- * representations about the suitability of this software for any

- * purpose.  It is provided "as is" without express or implied

- * warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

- * SOFTWARE.

- */

-

-#ifndef _GLX_dri_common_h

-#define _GLX_dri_common_h

-

-typedef struct __GLXDRIconfig	__GLXDRIconfig;

-struct __GLXDRIconfig {

-    __GLXconfig config;

-    const __DRIconfig *driConfig;

-};

-

-__GLXconfig *

-glxConvertConfigs(const __DRIcoreExtension *core,

-		  const __DRIconfig **configs, unsigned int drawableType);

-

-extern const __DRIsystemTimeExtension systemTimeExtension;

-

-void *

-glxProbeDriver(const char *name,

-	       void **coreExt, const char *coreName, int coreVersion,

-	       void **renderExt, const char *renderName, int renderVersion);

-

-#endif

+/*
+ * Copyright © 2008 Red Hat, Inc
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of the
+ * copyright holders not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#ifndef _GLX_dri_common_h
+#define _GLX_dri_common_h
+
+typedef struct __GLXDRIconfig __GLXDRIconfig;
+struct __GLXDRIconfig {
+    __GLXconfig config;
+    const __DRIconfig *driConfig;
+};
+
+__GLXconfig *glxConvertConfigs(const __DRIcoreExtension * core,
+                               const __DRIconfig ** configs,
+                               unsigned int drawableType);
+
+extern const __DRIsystemTimeExtension systemTimeExtension;
+
+void *glxProbeDriver(const char *name,
+                     void **coreExt, const char *coreName, int coreVersion,
+                     void **renderExt, const char *renderName,
+                     int renderVersion);
+
+#endif