Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

1 files changed, 59 insertions, 59 deletions

diff --git a/src/glut/os2/layerutil.h b/src/glut/os2/layerutil.h
index 3786c4d871..3f62031939 100644
--- a/src/glut/os2/layerutil.h
+++ b/src/glut/os2/layerutil.h
@@ -1,59 +1,59 @@
-#ifndef __layerutil_h__

-#define __layerutil_h__

-

-/* Copyright (c) Mark J. Kilgard, 1993, 1994. */

-

-/* This program is freely distributable without licensing fees 

-   and is provided without guarantee or warrantee expressed or 

-   implied. This program is -not- in the public domain. */

-

-/* Based on XLayerUtil.h: Revision: 1.3 */

-

-#ifdef __VMS

-#include <GL/vms_x_fix.h>

-#endif

-

-#if !defined(_WIN32) && !defined(__OS2__)

-#include <X11/Xlib.h>

-#include <X11/Xutil.h>

-#include <X11/Xmd.h>

-#endif /* !_WIN32 */

-

-/* Transparent type values */

-/* None                       0 */

-#define TransparentPixel      1

-#define TransparentMask       2

-

-/* layered visual info template flags */

-#define VisualLayerMask		0x200

-#define VisualTransparentType	0x400

-#define VisualTransparentValue	0x800

-#define VisualAllLayerMask	0xFFF

-

-/* layered visual info structure */

-typedef struct _XLayerVisualInfo {

-  XVisualInfo vinfo;

-  long layer;

-  long type;

-  unsigned long value;

-} XLayerVisualInfo;

-

-/* SERVER_OVERLAY_VISUALS property element */

-typedef struct _OverlayInfo {

-  /* Avoid 64-bit portability problems by being careful to use

-     longs due to the way XGetWindowProperty is specified. Note

-     that these parameters are passed as CARD32s over X

-     protocol. */

-  long overlay_visual;

-  long transparent_type;

-  long value;

-  long layer;

-} OverlayInfo;

-

-extern int __glutGetTransparentPixel(Display *, XVisualInfo *);

-extern XLayerVisualInfo *__glutXGetLayerVisualInfo(Display *,

-  long, XLayerVisualInfo *, int *);

-extern Status __glutXMatchLayerVisualInfo(Display *,

-  int, int, int, int, XLayerVisualInfo *);

-

-#endif /* __layerutil_h__ */

+#ifndef __layerutil_h__
+#define __layerutil_h__
+
+/* Copyright (c) Mark J. Kilgard, 1993, 1994. */
+
+/* This program is freely distributable without licensing fees 
+   and is provided without guarantee or warrantee expressed or 
+   implied. This program is -not- in the public domain. */
+
+/* Based on XLayerUtil.h: Revision: 1.3 */
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
+#if !defined(_WIN32) && !defined(__OS2__)
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xmd.h>
+#endif /* !_WIN32 */
+
+/* Transparent type values */
+/* None                       0 */
+#define TransparentPixel      1
+#define TransparentMask       2
+
+/* layered visual info template flags */
+#define VisualLayerMask		0x200
+#define VisualTransparentType	0x400
+#define VisualTransparentValue	0x800
+#define VisualAllLayerMask	0xFFF
+
+/* layered visual info structure */
+typedef struct _XLayerVisualInfo {
+  XVisualInfo vinfo;
+  long layer;
+  long type;
+  unsigned long value;
+} XLayerVisualInfo;
+
+/* SERVER_OVERLAY_VISUALS property element */
+typedef struct _OverlayInfo {
+  /* Avoid 64-bit portability problems by being careful to use
+     longs due to the way XGetWindowProperty is specified. Note
+     that these parameters are passed as CARD32s over X
+     protocol. */
+  long overlay_visual;
+  long transparent_type;
+  long value;
+  long layer;
+} OverlayInfo;
+
+extern int __glutGetTransparentPixel(Display *, XVisualInfo *);
+extern XLayerVisualInfo *__glutXGetLayerVisualInfo(Display *,
+  long, XLayerVisualInfo *, int *);
+extern Status __glutXMatchLayerVisualInfo(Display *,
+  int, int, int, int, XLayerVisualInfo *);
+
+#endif /* __layerutil_h__ */