[PATCH 01/18] MITMisc: remove MITMisc.h library header, split into mitmistconst.h

[Peter Hutterer]

Moving extension name from mitmiststr.h into mitmiscconst.h.
Removing Xlib function prototypes from mitmiscconst.h.
Moving protocol request opcodes into mitmiscstr.h
---
 MITMisc.h      |   66 --------------------------------------------------------
 Makefile.am    |    2 +-
 mitmiscconst.h |   39 +++++++++++++++++++++++++++++++++
 mitmiscstr.h   |    5 +--
 4 files changed, 42 insertions(+), 70 deletions(-)
 delete mode 100644 MITMisc.h
 create mode 100644 mitmiscconst.h

diff --git a/MITMisc.h b/MITMisc.h
deleted file mode 100644
index 975700e..0000000
--- a/MITMisc.h
+++ /dev/null
@@ -1,66 +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 */
-
-/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
-#ifndef _XMITMISC_H_
-#define _XMITMISC_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_MITSetBugMode			0
-#define X_MITGetBugMode			1
-
-#define MITMiscNumberEvents		0
-
-#define MITMiscNumberErrors		0
-
-#ifndef _MITMISC_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XMITMiscQueryExtension(
-    Display*		/* dpy */,
-    int*		/* event_basep */,
-    int*		/* error_basep */
-);
-
-Status XMITMiscSetBugMode(
-    Display*		/* dpy */,
-    Bool		/* onOff */
-);
-
-Bool XMITMiscGetBugMode(
-    Display*		/* dpy */
-);
-
-_XFUNCPROTOEND
-
-#endif
-
-#endif
diff --git a/Makefile.am b/Makefile.am
index 9bd782a..7d7fc37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ xext_HEADERS = \
 	lbxopts.h \
 	lbxstr.h \
 	lbxzlib.h \
-	MITMisc.h \
+	mitmiscconst.h \
 	mitmiscstr.h \
 	multibuf.h \
 	multibufst.h \
diff --git a/mitmiscconst.h b/mitmiscconst.h
new file mode 100644
index 0000000..5eb0271
--- /dev/null
+++ b/mitmiscconst.h
@@ -0,0 +1,39 @@
+/************************************************************
+
+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 */
+
+/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
+
+#ifndef _MITMISCCONST_H_
+#define _MITMISCCONST_H_
+
+#define MITMiscNumberEvents		0
+#define MITMiscNumberErrors		0
+
+#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+
+#endif
diff --git a/mitmiscstr.h b/mitmiscstr.h
index 32cae26..f23e2c9 100644
--- a/mitmiscstr.h
+++ b/mitmiscstr.h
@@ -32,9 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _MITMISCSTR_H_
 #define _MITMISCSTR_H_
 
-#include "MITMisc.h"
-
-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+#define X_MITSetBugMode			0
+#define X_MITGetBugMode			1
 
 typedef struct _SetBugMode {
     CARD8	reqType;	/* always MITReqCode */
-- 
1.6.3.rc1.2.g0164.dirty