summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-25 10:24:57 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-16 11:29:01 +1000
commit3770d4bd035e43c8e2228d45184d9d398fccb325 (patch)
tree53c1a26dee81916773bc22c052974ad5ad941645
parent57d09e47d05fce0d6df4060b2eff9a8efcc25b2f (diff)
downloadxorg-proto-xextproto-3770d4bd035e43c8e2228d45184d9d398fccb325.tar.gz
MITMisc: remove MITMisc.h library header, split into mitmistproto.h
Moving extension name from mitmiststr.h into mitmisc.h. Removing Xlib function prototypes from mitmisc.h. Moving protocol request opcodes into mitmiscproto.h Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am4
-rw-r--r--mitmisc.h (renamed from MITMisc.h)33
-rw-r--r--mitmiscproto.h (renamed from mitmiscstr.h)11
3 files changed, 11 insertions, 37 deletions
diff --git a/Makefile.am b/Makefile.am
index d57ff93..4a6c38b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,8 @@ xext_HEADERS = \
geproto.h \
Xge.h \
lbxstr.h \
- MITMisc.h \
- mitmiscstr.h \
+ mitmisc.h \
+ mitmiscproto.h \
multibuf.h \
multibufst.h \
security.h \
diff --git a/MITMisc.h b/mitmisc.h
index 975700e..55863ef 100644
--- a/MITMisc.h
+++ b/mitmisc.h
@@ -28,39 +28,12 @@ in this Software without prior written authorization from The Open Group.
/* $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
+#ifndef _MITMISC_H_
+#define _MITMISC_H_
#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
+#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
#endif
diff --git a/mitmiscstr.h b/mitmiscproto.h
index 32cae26..7de9d26 100644
--- a/mitmiscstr.h
+++ b/mitmiscproto.h
@@ -29,12 +29,13 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: mitmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-#ifndef _MITMISCSTR_H_
-#define _MITMISCSTR_H_
+#ifndef _MITMISCPROTO_H_
+#define _MITMISCPROTO_H_
-#include "MITMisc.h"
+#include <X11/extensions/mitmisc.h>
-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+#define X_MITSetBugMode 0
+#define X_MITGetBugMode 1
typedef struct _SetBugMode {
CARD8 reqType; /* always MITReqCode */
@@ -67,4 +68,4 @@ typedef struct {
} xMITGetBugModeReply;
#define sz_xMITGetBugModeReply 32
-#endif /* _MITMISCSTR_H_ */
+#endif /* _MITMISCPROTO_H_ */