On Monday 20 Jul 2009 23:11:14 Jon TURNEY wrote: > On 16/07/2009 04:56, Peter Hutterer wrote: > > Those of you watching xorg-announce or xorg-commit may have noticed that > > I pushed the changes to xextproto and libXext. > > > > This commit series removed all client-side headers from xextproto and > > moved them into libXext instead. Clients should not be affected by this > > other than that the BuildRequires have changed. > > > > Most video drivers were affected (dpms.h -> dpmsconst.h). The patches > > for intel and radeonhd are in Keith's + Eric and Matthias inboxes. I've > > pushed updates for the rest of the video drivers myself. > > > > The rule for header files are now: > > Xfoo.h - library header file in libXext > > foo.h - extension constants, xextproto > > fooproto.h - protocol structures, xextproto > > > > for those headers where foo.h was already in use as client-side header > > (e.g. sync.h, dpms.h) the naming is > > foo.h - library header in libXext > > fooconst.h - extension constants, xextproto > > fooproto.h - protocol structures, xextproto > > > > If there are any build errors, please let me know. I'll be monitoring > > tinderbox for the next few hours. > > This pattern doesn't seem to have been followed for MITMisc, as there is > now > > MITMisc.h - library header in libXext > mitmisc.h - extension constants, xextproto > mitmiscproto.h - protocol structures, xextproto > > This fails on case-insensitive filesystems > (case-insensitive filesystems are also fail, but that's a separate issue > :-) ) > > Attached are patches to rename the header in xextproto from mitmisc.h to > mitmiscconst.h, which I think is the way to fix this if I've understood > your mail correctly. > > Apologies for not noticing this sooner.
The same goes for Xtest.h vs xtest.h. Patches attached. Cheers, Magnus
From b4f1eb1054fa413317f64a6ac1bca061a1e171b1 Mon Sep 17 00:00:00 2001 From: Magnus Kessler <[email protected]> Date: Wed, 22 Jul 2009 09:29:16 +0100 Subject: [PATCH] Rename xtest.h to xtestconst.h to avoid a collision with XTest.h on case-insensitive filesystems --- include/X11/extensions/XTest.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/X11/extensions/XTest.h b/include/X11/extensions/XTest.h index f27407a..aad9420 100644 --- a/include/X11/extensions/XTest.h +++ b/include/X11/extensions/XTest.h @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #define _XTEST_H_ #include <X11/Xfuncproto.h> -#include <X11/extensions/xtest.h> +#include <X11/extensions/xtestconst.h> #include <X11/extensions/XInput.h> _XFUNCPROTOBEGIN -- 1.6.3.3
From 3f3038dae60e7ae64c9ddba7d458a865219f1445 Mon Sep 17 00:00:00 2001 From: Magnus Kessler <[email protected]> Date: Wed, 22 Jul 2009 09:37:38 +0100 Subject: [PATCH] Rename xtest.h to xtestconst.h to avoid a collision with XTest.h on case-insensitive filesystems --- Makefile.am | 2 +- xtest.h | 41 ----------------------------------------- xtestconst.h | 41 +++++++++++++++++++++++++++++++++++++++++ xtestproto.h | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 xtest.h create mode 100644 xtestconst.h diff --git a/Makefile.am b/Makefile.am index 6ba1b08..8cdd0ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ xext_HEADERS = \ EVIproto.h \ xtestext1proto.h \ xtestext1const.h \ - xtest.h \ + xtestconst.h \ xtestproto.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/xtest.h b/xtest.h deleted file mode 100644 index e74b904..0000000 --- a/xtest.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - -Copyright 1992, 1998 The Open Group - -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. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -#ifndef _XTEST_CONST_H_ -#define _XTEST_CONST_H_ - -#define XTestNumberEvents 0 - -#define XTestNumberErrors 0 - -#define XTestCurrentCursor ((Cursor)1) - -#define XTestMajorVersion 2 -#define XTestMinorVersion 2 - -#define XTestExtensionName "XTEST" - -#endif diff --git a/xtestconst.h b/xtestconst.h new file mode 100644 index 0000000..e74b904 --- /dev/null +++ b/xtestconst.h @@ -0,0 +1,41 @@ +/* + +Copyright 1992, 1998 The Open Group + +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. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifndef _XTEST_CONST_H_ +#define _XTEST_CONST_H_ + +#define XTestNumberEvents 0 + +#define XTestNumberErrors 0 + +#define XTestCurrentCursor ((Cursor)1) + +#define XTestMajorVersion 2 +#define XTestMinorVersion 2 + +#define XTestExtensionName "XTEST" + +#endif diff --git a/xtestproto.h b/xtestproto.h index 2eb832e..4f8db26 100644 --- a/xtestproto.h +++ b/xtestproto.h @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XTESTPROTO_H_ #define _XTESTPROTO_H_ -#include <X11/extensions/xtest.h> +#include <X11/extensions/xtestconst.h> #define Window CARD32 #define Time CARD32 -- 1.6.3.3
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
