Module Name: xsrc
Committed By: mrg
Date: Sat May 22 05:47:55 UTC 2010
Modified Files:
xsrc/external/mit/libXext/dist/include/X11/extensions: Xdbe.h dpms.h
Log Message:
XXX: avoid issues with finding "Display" definition.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h
diff -u xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h:1.1.1.1 xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h:1.2
--- xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h:1.1.1.1 Sat May 22 01:04:31 2010
+++ xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h Sat May 22 05:47:55 2010
@@ -36,6 +36,7 @@
#define XDBE_H
#include <X11/Xfuncproto.h>
+#include <X11/extensions/dpms.h> /* XXXMRG makes Display available */
#include <X11/extensions/dbe.h>
typedef struct
Index: xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h
diff -u xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.2 xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.3
--- xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.2 Sat May 22 02:17:18 2010
+++ xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h Sat May 22 05:47:55 2010
@@ -36,10 +36,10 @@
#include <X11/Xmd.h>
#include <X11/extensions/dpmsconst.h>
-#ifndef Status
+#if !defined(_XKBSRV_H_) && !defined(_XLIB_H_)
/* XXX: this is a hack to let old xf86-video-* build. Does not belong here. */
-#define Bool int
-#define Status int
+typedef int Status;
+typedef pointer XPointer;
typedef struct _XDisplay Display;
#endif
