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
commit734e34ec1b2a3babcb2a2688be4a8edb322dbb19 (patch)
tree919830197f5ed9eb867b29f8b0b7753749f62f29
parent0c0b82a2143adfb443157badfe84093d8b74cc13 (diff)
downloadxorg-proto-scrnsaverproto-XINERAMA_2.tar.gz
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
-rw-r--r--scrnsaver.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/scrnsaver.h b/scrnsaver.h
index b20a648..fa2bc94 100644
--- a/scrnsaver.h
+++ b/scrnsaver.h
@@ -26,6 +26,7 @@ in this Software without prior written authorization from the X Consortium.
*
* Author: Keith Packard, MIT X Consortium
*/
+/* $XFree86: xc/include/extensions/scrnsaver.h,v 3.1 2003/11/17 22:20:03 dawes Exp $ */
#ifndef _SCRNSAVER_H_
#define _SCRNSAVER_H_
@@ -58,45 +59,34 @@ typedef struct {
_XFUNCPROTOBEGIN
extern Bool XScreenSaverQueryExtension (
-#if NeedFunctionPrototypes
Display* /* display */,
int* /* event_base */,
int* /* error_base */
-#endif
);
extern Status XScreenSaverQueryVersion (
-#if NeedFunctionPrototypes
Display* /* display */,
int* /* major_version */,
int* /* minor_version */
-#endif
);
extern XScreenSaverInfo *XScreenSaverAllocInfo (
-#if NeedFunctionPrototypes
void
-#endif
);
extern Status XScreenSaverQueryInfo (
-#if NeedFunctionPrototypes
Display* /* display */,
Drawable /* drawable */,
XScreenSaverInfo* /* info */
-#endif
);
extern void XScreenSaverSelectInput (
-#if NeedFunctionPrototypes
Display* /* display */,
Drawable /* drawable */,
unsigned long /* eventMask */
-#endif
);
extern void XScreenSaverSetAttributes (
-#if NeedFunctionPrototypes
Display* /* display */,
Drawable /* drawable */,
int /* x */,
@@ -109,39 +99,30 @@ extern void XScreenSaverSetAttributes (
Visual * /* visual */,
unsigned long /* valuemask */,
XSetWindowAttributes * /* attributes */
-#endif
);
extern void XScreenSaverUnsetAttributes (
-#if NeedFunctionPrototypes
Display* /* display */,
Drawable /* drawable */
-#endif
);
extern Status XScreenSaverRegister (
-#if NeedFunctionPrototypes
Display* /* display */,
int /* screen */,
XID /* xid */,
Atom /* type */
-#endif
);
extern Status XScreenSaverUnregister (
-#if NeedFunctionPrototypes
Display* /* display */,
int /* screen */
-#endif
);
extern Status XScreenSaverGetRegistered (
-#if NeedFunctionPrototypes
Display* /* display */,
int /* screen */,
XID* /* xid */,
Atom* /* type */
-#endif
);
_XFUNCPROTOEND