summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:31 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:31 +0000
commit2d332eaef52d0a64475f790c0e9cadc51bae1200 (patch)
treeaf078626a5782e5a643a7f18af3b012765ec4eb4
parent9b504b915181c1f16dd5bf1d6c0fddcc1f1abe89 (diff)
downloadxorg-proto-recordproto-XINERAMA_2.tar.gz
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
-rw-r--r--record.h32
1 files changed, 2 insertions, 30 deletions
diff --git a/record.h b/record.h
index 9234404..bab5e4e 100644
--- a/record.h
+++ b/record.h
@@ -21,6 +21,8 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**************************************************************************/
+/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */
+
#ifndef _RECORD_H_
#define _RECORD_H_
@@ -116,38 +118,29 @@ _XFUNCPROTOBEGIN
*/
XID XRecordIdBaseMask(
-#if NeedFunctionPrototypes
Display *dpy
-#endif
);
extern Status XRecordQueryVersion(
-#if NeedFunctionPrototypes
Display* /* dpy */,
int* /* cmajor_return */,
int* /* cminor_return */
-#endif
);
extern XRecordContext XRecordCreateContext(
-#if NeedFunctionPrototypes
Display* /* dpy */,
int /* datum_flags */,
XRecordClientSpec* /* clients */,
int /* nclients */,
XRecordRange** /* ranges */,
int /* nranges */
-#endif
);
extern XRecordRange *XRecordAllocRange(
-#if NeedFunctionPrototypes
void
-#endif
);
extern Status XRecordRegisterClients(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */,
int /* datum_flags */,
@@ -155,81 +148,60 @@ extern Status XRecordRegisterClients(
int /* nclients */,
XRecordRange** /* ranges */,
int /* nranges */
-#endif
);
extern Status XRecordUnregisterClients(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */,
XRecordClientSpec* /* clients */,
int /* nclients */
-#endif
);
extern Status XRecordGetContext(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */,
XRecordState** /* state_return */
-#endif
);
extern void XRecordFreeState(
-#if NeedFunctionPrototypes
XRecordState* /* state */
-#endif
);
typedef void (*XRecordInterceptProc) (
-#if NeedFunctionPrototypes
XPointer /* closure */,
XRecordInterceptData* /* recorded_data */
-#endif
);
extern Status XRecordEnableContext(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */,
XRecordInterceptProc /* callback */,
XPointer /* closure */
-#endif
);
extern Status XRecordEnableContextAsync(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */,
XRecordInterceptProc /* callback */,
XPointer /* closure */
-#endif
);
extern void XRecordProcessReplies(
-#if NeedFunctionPrototypes
Display* /* dpy */
-#endif
);
extern void XRecordFreeData(
-#if NeedFunctionPrototypes
XRecordInterceptData* /* data */
-#endif
);
extern Status XRecordDisableContext(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */
-#endif
);
extern Status XRecordFreeContext(
-#if NeedFunctionPrototypes
Display* /* dpy */,
XRecordContext /* context */
-#endif
);
_XFUNCPROTOEND