[PATCH] Rename mitmisc.h to mitmiscconst.h to avoid a collision with MITMisc.h on case-insensitive filesystems

Jon TURNEY jon.turney at dronecode.org.uk
Mon Jul 20 14:42:59 PDT 2009


---
 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


--------------040707040404080701000101--


More information about the xorg-devel mailing list