Module Name: xsrc
Committed By: mrg
Date: Thu Feb 24 08:18:04 UTC 2011
Modified Files:
xsrc/external/mit/libXext/dist/include/X11/extensions: Xdbe.h dpms.h
xsrc/external/mit/libXext/dist/src: extutil.c
Log Message:
revert local changes that are no longer necessary and infact hurt the build.
now we're back to being identical to upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXext/dist/src/extutil.c
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.3 xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h:1.4
--- xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h:1.3 Sun Nov 21 05:52:55 2010
+++ xsrc/external/mit/libXext/dist/include/X11/extensions/Xdbe.h Thu Feb 24 08:18:03 2011
@@ -34,7 +34,6 @@
#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.5 xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.6
--- xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.5 Sun Nov 21 05:52:55 2010
+++ xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h Thu Feb 24 08:18:03 2011
@@ -29,18 +29,10 @@
#ifndef _X11_EXTENSIONS_DPMS_H
#define _X11_EXTENSIONS_DPMS_H 1
-#include <X11/Xfuncproto.h>
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/extensions/dpmsconst.h>
-#if !defined(_XKBSRV_H_) && !defined(_XLIB_H_)
-/* XXX: this is a hack to let old xf86-video-* build. Does not belong here. */
-typedef int Status;
-typedef pointer XPointer;
-typedef struct _XDisplay Display;
-#endif
-
#ifndef DPMS_SERVER
_XFUNCPROTOBEGIN
Index: xsrc/external/mit/libXext/dist/src/extutil.c
diff -u xsrc/external/mit/libXext/dist/src/extutil.c:1.4 xsrc/external/mit/libXext/dist/src/extutil.c:1.5
--- xsrc/external/mit/libXext/dist/src/extutil.c:1.4 Sun Nov 21 05:52:55 2010
+++ xsrc/external/mit/libXext/dist/src/extutil.c Thu Feb 24 08:18:03 2011
@@ -52,6 +52,7 @@
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
+#include <X11/extensions/ge.h>
/* defined in Xge.c */
extern _X_HIDDEN Bool
@@ -119,6 +120,11 @@
XESetWireToEvent (dpy, j, hooks->wire_to_event);
XESetEventToWire (dpy, j, hooks->event_to_wire);
}
+
+ /* register extension for XGE */
+ if (strcmp(ext_name, GE_NAME))
+ xgeExtRegister(dpy, dpyinfo->codes->major_opcode, hooks);
+
if (hooks->create_gc)
XESetCreateGC (dpy, dpyinfo->codes->extension, hooks->create_gc);
if (hooks->copy_gc)
@@ -236,7 +242,7 @@
-static int _default_exterror (Display *dpy, char *ext_name, char *reason)
+static int _default_exterror (Display *dpy, _Xconst char *ext_name, _Xconst char *reason)
{
fprintf (stderr, "Xlib: extension \"%s\" %s on display \"%s\".\n",
ext_name, reason, DisplayString(dpy));
@@ -266,8 +272,8 @@
*/
int XMissingExtension (Display *dpy, _Xconst char *ext_name)
{
- int (*func)(Display*, char *, char *) = (_XExtensionErrorFunction ?
- _XExtensionErrorFunction : _default_exterror);
+ XextErrorHandler func = (_XExtensionErrorFunction ?
+ _XExtensionErrorFunction : _default_exterror);
if (!ext_name) ext_name = X_EXTENSION_UNKNOWN;
return (*func) (dpy, ext_name, X_EXTENSION_MISSING);
