Module Name: xsrc
Committed By: mrg
Date: Wed Jun 16 03:16:51 UTC 2010
Modified Files:
xsrc/external/mit/libXext/dist/include/X11/extensions: dpms.h
xsrc/external/mit/libXext/dist/src: extutil.c
Removed Files:
xsrc/external/mit/libXext/dist: NEWS
Log Message:
merge libXext 1.1.2
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXext/dist/NEWS
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h
cvs rdiff -u -r1.2 -r1.3 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/dpms.h
diff -u xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.3 xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.4
--- xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h:1.3 Sat May 22 05:47:55 2010
+++ xsrc/external/mit/libXext/dist/include/X11/extensions/dpms.h Wed Jun 16 03:16:50 2010
@@ -43,6 +43,7 @@
typedef struct _XDisplay Display;
#endif
+#ifndef DPMS_SERVER
_XFUNCPROTOBEGIN
extern Bool DPMSQueryExtension(Display *, int *, int *);
@@ -56,6 +57,7 @@
extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
_XFUNCPROTOEND
+#endif
#endif /* !_X11_EXTENSIONS_DPMS_H */
Index: xsrc/external/mit/libXext/dist/src/extutil.c
diff -u xsrc/external/mit/libXext/dist/src/extutil.c:1.2 xsrc/external/mit/libXext/dist/src/extutil.c:1.3
--- xsrc/external/mit/libXext/dist/src/extutil.c:1.2 Mon Mar 9 06:58:24 2009
+++ xsrc/external/mit/libXext/dist/src/extutil.c Wed Jun 16 03:16:50 2010
@@ -55,6 +55,9 @@
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
+/* defined in Xge.c */
+extern _X_HIDDEN Bool
+xgeExtRegister(Display* dpy, int extension, XExtensionHooks* callbacks);
/*
* XextCreateExtension - return an extension descriptor containing context
