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.
>From 3d1061ca05c3e6c9c24b87688e57a70623ec7384 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <[email protected]>
Date: Mon, 20 Jul 2009 22:49:15 +0100
Subject: [PATCH] Rename mitmisc.h to mitmiscconst.h to avoid a collision with
MITMisc.h on case-insensitive filesystems
---
include/X11/extensions/MITMisc.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/X11/extensions/MITMisc.h b/include/X11/extensions/MITMisc.h
index acb6850..5b9713e 100644
--- a/include/X11/extensions/MITMisc.h
+++ b/include/X11/extensions/MITMisc.h
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The
Open Group.
#define _XMITMISC_H_
#include <X11/Xfuncproto.h>
-#include <X11/extensions/mitmisc.h>
+#include <X11/extensions/mitmiscconst.h>
_XFUNCPROTOBEGIN
--
1.6.3.2
>From 2e9a724fc177cea53ae350509e137c97ee44c391 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <[email protected]>
Date: Mon, 20 Jul 2009 22:42:59 +0100
Subject: [PATCH] Rename mitmisc.h to mitmiscconst.h to avoid a collision with
MITMisc.h on case-insensitive filesystems
---
Makefile.am | 2 +-
mitmisc.h | 38 --------------------------------------
mitmiscconst.h | 38 ++++++++++++++++++++++++++++++++++++++
mitmiscproto.h | 2 +-
4 files changed, 40 insertions(+), 40 deletions(-)
delete mode 100644 mitmisc.h
create mode 100644 mitmiscconst.h
diff --git a/Makefile.am b/Makefile.am
index 40cc826..6ba1b08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ xext_HEADERS = \
geproto.h \
lbx.h \
lbxproto.h \
- mitmisc.h \
+ mitmiscconst.h \
mitmiscproto.h \
multibufconst.h \
multibufproto.h \
diff --git a/mitmisc.h b/mitmisc.h
deleted file mode 100644
index 7c67f97..0000000
--- a/mitmisc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/************************************************************
-
-Copyright 1989, 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.
-
-********************************************************/
-
-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING
*/
-
-
-#ifndef _MITMISC_H_
-#define _MITMISC_H_
-
-#define MITMiscNumberEvents 0
-#define MITMiscNumberErrors 0
-
-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
-
-#endif
diff --git a/mitmiscconst.h b/mitmiscconst.h
new file mode 100644
index 0000000..adc5f94
--- /dev/null
+++ b/mitmiscconst.h
@@ -0,0 +1,38 @@
+/************************************************************
+
+Copyright 1989, 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.
+
+********************************************************/
+
+/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING
*/
+
+
+#ifndef _MITMISCCONST_H_
+#define _MITMISCCONST_H_
+
+#define MITMiscNumberEvents 0
+#define MITMiscNumberErrors 0
+
+#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+
+#endif
diff --git a/mitmiscproto.h b/mitmiscproto.h
index 31a7af1..18c202a 100644
--- a/mitmiscproto.h
+++ b/mitmiscproto.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The
Open Group.
#ifndef _MITMISCPROTO_H_
#define _MITMISCPROTO_H_
-#include <X11/extensions/mitmisc.h>
+#include <X11/extensions/mitmiscconst.h>
#define X_MITSetBugMode 0
#define X_MITGetBugMode 1
--
1.6.3.2
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel
