From 7e018a8e4a0f8519e0fca19c5a70b9bb4bacd402 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:48:31 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- MITMisc.h | 6 ------ XEVI.h | 8 ++------ XLbx.h | 6 +----- XShm.h | 30 +-------------------------- XTest.h | 32 +---------------------------- Xag.h | 18 +---------------- Xagsrv.h | 24 +--------------------- Xcup.h | 7 +------ Xdbe.h | 20 +----------------- Xext.h | 10 +-------- dpmsstr.h | 8 ++++---- extutil.h | 34 +------------------------------ lbximage.h | 22 +------------------- mitmiscstr.h | 5 +++++ multibuf.h | 38 +--------------------------------- multibufst.h | 26 +----------------------- shape.h | 24 +--------------------- shmstr.h | 10 +-------- sync.h | 66 +----------------------------------------------------------- syncstr.h | 33 +++++++++++++----------------- 20 files changed, 40 insertions(+), 387 deletions(-) diff --git a/MITMisc.h b/MITMisc.h index 2e87bff..975700e 100644 --- a/MITMisc.h +++ b/MITMisc.h @@ -45,24 +45,18 @@ in this Software without prior written authorization from The Open Group. _XFUNCPROTOBEGIN Bool XMITMiscQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* event_basep */, int* /* error_basep */ -#endif ); Status XMITMiscSetBugMode( -#if NeedFunctionPrototypes Display* /* dpy */, Bool /* onOff */ -#endif ); Bool XMITMiscGetBugMode( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); _XFUNCPROTOEND diff --git a/XEVI.h b/XEVI.h index 988f42e..1ac33b9 100644 --- a/XEVI.h +++ b/XEVI.h @@ -21,6 +21,8 @@ DATA OR PROFITS, WHETHER IN 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/XEVI.h,v 3.5 2003/11/17 22:20:02 dawes Exp $ */ + #ifndef _XEVI_H_ #define _XEVI_H_ #include @@ -43,25 +45,19 @@ typedef struct { } ExtendedVisualInfo; _XFUNCPROTOBEGIN Bool XeviQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); Status XeviQueryVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* majorVersion */, int* /* minorVersion */ -#endif ); Status XeviGetVisualInfo( -#if NeedFunctionPrototypes Display* /* dpy */, VisualID* /* visual_query */, int /* nVisual_query */, ExtendedVisualInfo** /* extendedVisualInfo_return */, int* /* nInfo_return */ -#endif ); _XFUNCPROTOEND #endif diff --git a/XLbx.h b/XLbx.h index 87651d7..3e498ef 100644 --- a/XLbx.h +++ b/XLbx.h @@ -20,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XLbx.h,v 1.4 2003/11/17 22:20:02 dawes Exp $ */ #ifndef _XLBX_H_ #define _XLBX_H_ @@ -134,20 +134,16 @@ _XFUNCPROTOBEGIN Bool XLbxQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* requestp */, int* /* event_basep */, int* /* error_basep */ -#endif ); Bool XLbxQueryVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* majorVersion */, int* /* minorVersion */ -#endif ); int XLbxGetEventBase(Display *dpy); diff --git a/XShm.h b/XShm.h index 8be6dce..39f48cd 100644 --- a/XShm.h +++ b/XShm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/XShm.h,v 1.10 2002/11/08 00:46:27 alanh Exp $ */ +/* $XFree86: xc/include/extensions/XShm.h,v 1.12 2003/11/17 22:20:03 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -72,54 +72,35 @@ typedef struct { _XFUNCPROTOBEGIN Bool XShmQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif -); - -int XShmGetEventBase( -#if NeedFunctionPrototypes - Display* /* dpy */ -#endif ); int XShmGetEventBase( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); Bool XShmQueryVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* majorVersion */, int* /* minorVersion */, Bool* /* sharedPixmaps */ -#endif ); int XShmPixmapFormat( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); Status XShmAttach( -#if NeedFunctionPrototypes Display* /* dpy */, XShmSegmentInfo* /* shminfo */ -#endif ); Status XShmDetach( -#if NeedFunctionPrototypes Display* /* dpy */, XShmSegmentInfo* /* shminfo */ -#endif ); Status XShmPutImage( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* d */, GC /* gc */, @@ -131,22 +112,18 @@ Status XShmPutImage( unsigned int /* src_width */, unsigned int /* src_height */, Bool /* send_event */ -#endif ); Status XShmGetImage( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* d */, XImage* /* image */, int /* x */, int /* y */, unsigned long /* plane_mask */ -#endif ); XImage *XShmCreateImage( -#if NeedFunctionPrototypes Display* /* dpy */, Visual* /* visual */, unsigned int /* depth */, @@ -155,11 +132,9 @@ XImage *XShmCreateImage( XShmSegmentInfo* /* shminfo */, unsigned int /* width */, unsigned int /* height */ -#endif ); Pixmap XShmCreatePixmap( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* d */, char* /* data */, @@ -167,7 +142,6 @@ Pixmap XShmCreatePixmap( unsigned int /* width */, unsigned int /* height */, unsigned int /* depth */ -#endif ); _XFUNCPROTOEND @@ -179,9 +153,7 @@ _XFUNCPROTOEND #include "gc.h" extern void ShmRegisterFbFuncs( -#if NeedFunctionPrototypes ScreenPtr /* pScreen */ -#endif ); #endif diff --git a/XTest.h b/XTest.h index 9dea434..7403d20 100644 --- a/XTest.h +++ b/XTest.h @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XTest.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _XTEST_H_ #define _XTEST_H_ @@ -52,69 +52,54 @@ in this Software without prior written authorization from The Open Group. _XFUNCPROTOBEGIN Bool XTestQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* event_basep */, int* /* error_basep */, int* /* majorp */, int* /* minorp */ -#endif ); Bool XTestCompareCursorWithWindow( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* window */, Cursor /* cursor */ -#endif ); Bool XTestCompareCurrentCursorWithWindow( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* window */ -#endif ); extern int XTestFakeKeyEvent( -#if NeedFunctionPrototypes Display* /* dpy */, unsigned int /* keycode */, Bool /* is_press */, unsigned long /* delay */ -#endif ); extern int XTestFakeButtonEvent( -#if NeedFunctionPrototypes Display* /* dpy */, unsigned int /* button */, Bool /* is_press */, unsigned long /* delay */ -#endif ); extern int XTestFakeMotionEvent( -#if NeedFunctionPrototypes Display* /* dpy */, int /* screen */, int /* x */, int /* y */, unsigned long /* delay */ -#endif ); extern int XTestFakeRelativeMotionEvent( -#if NeedFunctionPrototypes Display* /* dpy */, int /* x */, int /* y */, unsigned long /* delay */ -#endif ); extern int XTestFakeDeviceKeyEvent( -#if NeedFunctionPrototypes Display* /* dpy */, XDevice* /* dev */, unsigned int /* keycode */, @@ -122,11 +107,9 @@ extern int XTestFakeDeviceKeyEvent( int* /* axes */, int /* n_axes */, unsigned long /* delay */ -#endif ); extern int XTestFakeDeviceButtonEvent( -#if NeedFunctionPrototypes Display* /* dpy */, XDevice* /* dev */, unsigned int /* button */, @@ -134,22 +117,18 @@ extern int XTestFakeDeviceButtonEvent( int* /* axes */, int /* n_axes */, unsigned long /* delay */ -#endif ); extern int XTestFakeProximityEvent( -#if NeedFunctionPrototypes Display* /* dpy */, XDevice* /* dev */, Bool /* in_prox */, int* /* axes */, int /* n_axes */, unsigned long /* delay */ -#endif ); extern int XTestFakeDeviceMotionEvent( -#if NeedFunctionPrototypes Display* /* dpy */, XDevice* /* dev */, Bool /* is_relative */, @@ -157,34 +136,25 @@ extern int XTestFakeDeviceMotionEvent( int* /* axes */, int /* n_axes */, unsigned long /* delay */ -#endif ); extern int XTestGrabControl( -#if NeedFunctionPrototypes Display* /* dpy */, Bool /* impervious */ -#endif ); void XTestSetGContextOfGC( -#if NeedFunctionPrototypes GC /* gc */, GContext /* gid */ -#endif ); void XTestSetVisualIDOfVisual( -#if NeedFunctionPrototypes Visual* /* visual */, VisualID /* visualid */ -#endif ); Status XTestDiscard( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); _XFUNCPROTOEND diff --git a/Xag.h b/Xag.h index b075342..7372f3c 100644 --- a/Xag.h +++ b/Xag.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xag.h,v 1.6 2003/11/17 22:20:03 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -59,67 +59,51 @@ _XFUNCPROTOBEGIN typedef XID XAppGroup; Bool XagQueryVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* major_version */, int* /* minor_version */ -#endif ); Status XagCreateEmbeddedApplicationGroup( -#if NeedFunctionPrototypes Display* /* dpy */, VisualID /* root_visual */, Colormap /* default_colormap */, unsigned long /* black_pixel */, unsigned long /* white_pixel */, XAppGroup* /* app_group_return */ -#endif ); Status XagCreateNonembeddedApplicationGroup( -#if NeedFunctionPrototypes Display* /* dpy */, XAppGroup* /* app_group_return */ -#endif ); Status XagDestroyApplicationGroup( -#if NeedFunctionPrototypes Display* /* dpy */, XAppGroup /* app_group */ -#endif ); Status XagGetApplicationGroupAttributes( -#if NeedVarargsPrototypes Display* /* dpy */, XAppGroup /* app_group */, ... -#endif ); Status XagQueryApplicationGroup( -#if NeedFunctionPrototypes Display* /* dpy */, XID /* resource_base */, XAppGroup* /* app_group_ret */ -#endif ); Status XagCreateAssociation( -#if NeedFunctionPrototypes Display* /* dpy */, Window* /* window_ret */, void* /* system_window */ -#endif ); Status XagDestroyAssociation( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* window */ -#endif ); _XFUNCPROTOEND diff --git a/Xagsrv.h b/Xagsrv.h index 03f84e7..074e60a 100644 --- a/Xagsrv.h +++ b/Xagsrv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.4 2001/12/20 19:25:43 tsi Exp $ */ +/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.6 2003/11/17 22:20:03 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -33,63 +33,41 @@ from The Open Group. _XFUNCPROTOBEGIN -extern void XagExtensionInit( -#if NeedFunctionPrototypes - void -#endif -); - extern void XagConnectionInfo( -#if NeedFunctionPrototypes ClientPtr /* client */, xConnSetupPrefix** /* conn_prefix */, char** /* conn_info */, int* /* num_screens */ -#endif ); extern VisualID XagRootVisual( -#if NeedFunctionPrototypes ClientPtr /* client */ -#endif ); extern Colormap XagDefaultColormap( -#if NeedFunctionPrototypes ClientPtr /* client */ -#endif ); extern ClientPtr XagLeader( -#if NeedFunctionPrototypes ClientPtr /* client */ -#endif ); extern void XagCallClientStateChange( -#if NeedFunctionPrototypes ClientPtr /* client */ -#endif ); extern Bool XagIsControlledRoot ( -#if NeedFunctionPrototypes ClientPtr /* client */, WindowPtr /* pParent */ -#endif ); extern XID XagId ( -#if NeedFunctionPrototypes ClientPtr /* client */ -#endif ); extern void XagGetDeltaInfo ( -#if NeedFunctionPrototypes ClientPtr /* client */, CARD32* /* buf */ -#endif ); _XFUNCPROTOEND diff --git a/Xcup.h b/Xcup.h index 512892a..ef7d803 100644 --- a/Xcup.h +++ b/Xcup.h @@ -24,6 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/Xcup.h,v 3.6 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _XCUP_H_ #define _XCUP_H_ @@ -41,29 +42,23 @@ in this Software without prior written authorization from The Open Group. _XFUNCPROTOBEGIN Bool XcupQueryVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* major_version */, int* /* minor_version */ -#endif ); Status XcupGetReservedColormapEntries( -#if NeedFunctionPrototypes Display* /* dpy */, int /* screen */, XColor** /* colors_out */, int* /* ncolors */ -#endif ); Status XcupStoreColors( -#if NeedFunctionPrototypes Display* /* dpy */, Colormap /* colormap */, XColor* /* colors */, int /* ncolors */ -#endif ); _XFUNCPROTOEND diff --git a/Xdbe.h b/Xdbe.h index 6e155df..74d11d4 100644 --- a/Xdbe.h +++ b/Xdbe.h @@ -30,7 +30,7 @@ * Header file for Xlib-related DBE * *****************************************************************************/ -/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/Xdbe.h,v 3.3 2003/11/17 22:20:03 dawes Exp $ */ #ifndef XDBE_H #define XDBE_H @@ -85,67 +85,49 @@ XdbeBufferError; _XFUNCPROTOBEGIN extern Status XdbeQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* major_version_return */, int* /* minor_version_return */ -#endif ); extern XdbeBackBuffer XdbeAllocateBackBufferName( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* window */, XdbeSwapAction /* swap_action */ -#endif ); extern Status XdbeDeallocateBackBufferName( -#if NeedFunctionPrototypes Display* /* dpy */, XdbeBackBuffer /* buffer */ -#endif ); extern Status XdbeSwapBuffers( -#if NeedFunctionPrototypes Display* /* dpy */, XdbeSwapInfo* /* swap_info */, int /* num_windows */ -#endif ); extern Status XdbeBeginIdiom( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern Status XdbeEndIdiom( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XdbeScreenVisualInfo *XdbeGetVisualInfo( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable* /* screen_specifiers */, int* /* num_screens */ -#endif ); extern void XdbeFreeVisualInfo( -#if NeedFunctionPrototypes XdbeScreenVisualInfo* /* visual_info */ -#endif ); extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes( -#if NeedFunctionPrototypes Display* /* dpy */, XdbeBackBuffer /* buffer */ -#endif ); _XFUNCPROTOEND diff --git a/Xext.h b/Xext.h index 553d242..f7b87d9 100644 --- a/Xext.h +++ b/Xext.h @@ -23,7 +23,7 @@ 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. */ -/* $XFree86: xc/include/extensions/Xext.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xext.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _XEXT_H_ #define _XEXT_H_ @@ -33,28 +33,20 @@ in this Software without prior written authorization from The Open Group. _XFUNCPROTOBEGIN extern int (*XSetExtensionErrorHandler( -#if NeedFunctionPrototypes int (*handler)( -#if NeedNestedPrototypes Display *, char *, char * -#endif ) -#endif ))( -#if NeedNestedPrototypes Display *, char *, char * -#endif ); extern int XMissingExtension( -#if NeedFunctionPrototypes Display* /* dpy */, _Xconst char* /* ext_name */ -#endif ); _XFUNCPROTOEND diff --git a/dpmsstr.h b/dpmsstr.h index 0ec0157..710960d 100644 --- a/dpmsstr.h +++ b/dpmsstr.h @@ -26,6 +26,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ +/* $XFree86: xc/include/extensions/dpmsstr.h,v 3.4 2003/07/16 01:38:24 dawes Exp $ */ /* * HISTORY @@ -34,6 +35,8 @@ Equipment Corporation. * @(#)RCSfile: dpmsstr.h,v Revision: 1.1.4.2 (DEC) Date: 1995/11/21 19:34:19 */ +#ifndef _DPMSSTR_H_ +#define _DPMSSTR_H_ #define X_DPMSGetVersion 0 #define X_DPMSCapable 1 @@ -180,7 +183,4 @@ typedef struct { } xDPMSInfoReply; #define sz_xDPMSInfoReply 32 - - - - +#endif /* _DPMSSTR_H_ */ diff --git a/extutil.h b/extutil.h index cb35927..83bc24c 100644 --- a/extutil.h +++ b/extutil.h @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND * ARE SUBJECT TO CHANGE! */ -/* $XFree86: xc/include/extensions/extutil.h,v 1.9 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/extutil.h,v 1.10 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ @@ -58,117 +58,85 @@ typedef struct _XExtensionInfo { typedef struct _XExtensionHooks { int (*create_gc)( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ); int (*copy_gc)( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ); int (*flush_gc)( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ); int (*free_gc)( -#if NeedNestedPrototypes Display* /* display */, GC /* gc */, XExtCodes* /* codes */ -#endif ); int (*create_font)( -#if NeedNestedPrototypes Display* /* display */, XFontStruct* /* fs */, XExtCodes* /* codes */ -#endif ); int (*free_font)( -#if NeedNestedPrototypes Display* /* display */, XFontStruct* /* fs */, XExtCodes* /* codes */ -#endif ); int (*close_display)( -#if NeedNestedPrototypes Display* /* display */, XExtCodes* /* codes */ -#endif ); Bool (*wire_to_event)( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* re */, xEvent* /* event */ -#endif ); Status (*event_to_wire)( -#if NeedNestedPrototypes Display* /* display */, XEvent* /* re */, xEvent* /* event */ -#endif ); int (*error)( -#if NeedNestedPrototypes Display* /* display */, xError* /* err */, XExtCodes* /* codes */, int* /* ret_code */ -#endif ); char *(*error_string)( -#if NeedNestedPrototypes Display* /* display */, int /* code */, XExtCodes* /* codes */, char* /* buffer */, int /* nbytes */ -#endif ); } XExtensionHooks; extern XExtensionInfo *XextCreateExtension( -#if NeedFunctionPrototypes void -#endif ); extern void XextDestroyExtension( -#if NeedFunctionPrototypes XExtensionInfo* /* info */ -#endif ); extern XExtDisplayInfo *XextAddDisplay( -#if NeedFunctionPrototypes XExtensionInfo* /* extinfo */, Display* /* dpy */, char* /* ext_name */, XExtensionHooks* /* hooks */, int /* nevents */, XPointer /* data */ -#endif ); extern int XextRemoveDisplay( -#if NeedFunctionPrototypes XExtensionInfo* /* extinfo */, Display* /* dpy */ -#endif ); extern XExtDisplayInfo *XextFindDisplay( -#if NeedFunctionPrototypes XExtensionInfo* /* extinfo */, Display* /* dpy */ -#endif ); #define XextHasExtension(i) ((i) && ((i)->codes)) diff --git a/lbximage.h b/lbximage.h index cc6faa3..89d1abf 100644 --- a/lbximage.h +++ b/lbximage.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/include/extensions/lbximage.h,v 1.4 2001/12/20 19:28:54 tsi Exp $ */ +/* $XFree86: xc/include/extensions/lbximage.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _LBX_IMAGE_H_ #define _LBX_IMAGE_H_ @@ -41,13 +41,10 @@ typedef struct _LbxBitmapCompMethod { int methodOpCode; /* to be filled on reply from server */ int (*compInit)( -#if NeedFunctionPrototypes void -#endif ); int (*compFunc)( -#if NeedFunctionPrototypes unsigned char * /* inbuf */, unsigned char * /* outbuf */, int /* outbufSize */, @@ -56,18 +53,15 @@ typedef struct _LbxBitmapCompMethod { int /* padded_bytes_per_scanline */, int /* reverse_bits */, int * /* bytesCompressed */ -#endif ); int (*decompFunc)( -#if NeedFunctionPrototypes unsigned char * /* inbuf */, unsigned char * /* outbuf */, int /* image_bytes */, int /* pixels_per_line */, int /* padded_bytes_per_scanline */, int /* reverse_bits */ -#endif ); } LbxBitmapCompMethod; @@ -85,13 +79,10 @@ typedef struct _LbxPixmapCompMethod { int methodOpCode; /* to be filled on reply from server */ int (*compInit)( -#if NeedFunctionPrototypes void -#endif ); int (*compFunc)( -#if NeedFunctionPrototypes char * /* inbuf */, char * /* outbuf */, int /* outbufSize */, @@ -100,23 +91,19 @@ typedef struct _LbxPixmapCompMethod { int /* num_scan_lines */, int /* scan_line_size */, int * /* bytesCompressed */ -#endif ); int (*decompFunc)( -#if NeedFunctionPrototypes char * /* inbuf */, char * /* outbuf */, int /* num_scan_lines */, int /* scan_line_size */ -#endif ); } LbxPixmapCompMethod; extern int LbxImageEncodePackBits ( -#if NeedFunctionPrototypes char * /* inbuf */, char * /* outbuf */, int /* outbufSize */, @@ -125,11 +112,9 @@ int /* depth */, int /* num_scan_lines */, int /* scan_line_size */, int * /* bytesCompressed */ -#endif ); extern int LbxImageEncodeFaxG42D ( -#if NeedFunctionPrototypes unsigned char * /* inbuf */, unsigned char * /* outbuf */, int /* outbufSize */, @@ -138,27 +123,22 @@ int /* pixels_per_line */, int /* padded_bytes_per_scanline */, int /* reverse_bits */, int * /* bytesCompressed */ -#endif ); extern int LbxImageDecodePackBits ( -#if NeedFunctionPrototypes char * /* inbuf */, char * /* outbuf */, int /* num_scan_lines */, int /* scan_line_size */ -#endif ); extern int LbxImageDecodeFaxG42D ( -#if NeedFunctionPrototypes unsigned char * /* inbuf */, unsigned char * /* outbuf */, int /* image_bytes */, int /* pixels_per_line */, int /* padded_bytes_per_scanline */, int /* reverse_bits */ -#endif ); _XFUNCPROTOEND diff --git a/mitmiscstr.h b/mitmiscstr.h index 209bcf5..7f819bf 100644 --- a/mitmiscstr.h +++ b/mitmiscstr.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/mitmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -28,6 +29,9 @@ 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_ + #include "MITMisc.h" #define MITMISCNAME "MIT-SUNDRY-NONSTANDARD" @@ -63,3 +67,4 @@ typedef struct { } xMITGetBugModeReply; #define sz_xMITGetBugModeReply 32 +#endif /* _MITMISCSTR_H_ */ diff --git a/multibuf.h b/multibuf.h index 24b13fd..8ad1be8 100644 --- a/multibuf.h +++ b/multibuf.h @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibuf.h,v 3.5 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _MULTIBUF_H_ #define _MULTIBUF_H_ @@ -173,96 +173,75 @@ typedef struct { _XFUNCPROTOBEGIN extern Bool XmbufQueryExtension( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* event_base_return */, int* /* error_base_return */ -#endif ); extern Status XmbufGetVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* major_version_return */, int* /* minor_version_return */ -#endif ); extern int XmbufCreateBuffers( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* w */, int /* count */, int /* update_action */, int /* update_hint */, Multibuffer* /* buffers */ -#endif ); extern void XmbufDestroyBuffers( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* window */ -#endif ); extern void XmbufDisplayBuffers( -#if NeedFunctionPrototypes Display* /* dpy */, int /* count */, Multibuffer* /* buffers */, int /* min_delay */, int /* max_delay */ -#endif ); extern Status XmbufGetWindowAttributes( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* w */, XmbufWindowAttributes* /* attr */ -#endif ); extern void XmbufChangeWindowAttributes( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* w */, unsigned long /* valuemask */, XmbufSetWindowAttributes* /* attr */ -#endif ); extern Status XmbufGetBufferAttributes( -#if NeedFunctionPrototypes Display* /* dpy */, Multibuffer /* b */, XmbufBufferAttributes* /* attr */ -#endif ); extern void XmbufChangeBufferAttributes( -#if NeedFunctionPrototypes Display* /* dpy */, Multibuffer /* b */, unsigned long /* valuemask */, XmbufSetBufferAttributes* /* attr */ -#endif ); extern Status XmbufGetScreenInfo( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* d */, int* /* nmono_return */, XmbufBufferInfo** /* mono_info_return */, int* /* nstereo_return */, XmbufBufferInfo** /* stereo_info_return */ -#endif ); extern Window XmbufCreateStereoWindow( -#if NeedFunctionPrototypes Display* /* dpy */, Window /* parent */, int /* x */, @@ -277,11 +256,9 @@ extern Window XmbufCreateStereoWindow( XSetWindowAttributes* /* attr */, Multibuffer* /* leftp */, Multibuffer* /* rightp */ -#endif ); extern void XmbufClearBufferArea( -#if NeedFunctionPrototypes Display* /* dpy */, Multibuffer /* buffer */, int /* x */, @@ -289,7 +266,6 @@ extern void XmbufClearBufferArea( unsigned int /* width */, unsigned int /* height */, Bool /* exposures */ -#endif ); _XFUNCPROTOEND @@ -303,21 +279,16 @@ typedef Bool (* mbInitFunc)(); struct _mbufScreen; /* declared in multibufst.h */ extern void RegisterMultibufferInit( -#if NeedFunctionPrototypes ScreenPtr /* pScreen */, Bool (* /* bufMultibufferInit */)( -#if NeedNestedPrototypes ScreenPtr /* pScreen */, struct _mbufScreen * /* pMBScreen */ -#endif ) -#endif ); struct xMbufBufferInfo; /* declared in multibufst.h */ extern void RegisterDoubleBufferHardware( -#if NeedFunctionPrototypes ScreenPtr /* pScreen */, int /* nInfo */, struct xMbufBufferInfo * /* pInfo */, @@ -325,28 +296,21 @@ extern void RegisterDoubleBufferHardware( DevUnion /* selectPlane */, void (* /* CopyBufferBitsFunc */ )(), void (* /* DrawSelectPlaneFunc */ )() -#endif ); extern int CreateImageBuffers ( -#if NeedFunctionPrototypes WindowPtr /* pWin */, int /* nbuf */, XID * /* ids */, int /* action */, int /* hint */ -#endif ); extern void DestroyImageBuffers ( -#if NeedFunctionPrototypes WindowPtr /* pWin */ -#endif ); extern int DisplayImageBuffers ( -#if NeedFunctionPrototypes XID * /* ids */, int /* nbuf */ -#endif ); #endif /* _MULTIBUF_SERVER_ */ diff --git a/multibufst.h b/multibufst.h index 01eac0f..aeb6632 100644 --- a/multibufst.h +++ b/multibufst.h @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/multibufst.h,v 3.8 2001/12/19 21:37:29 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibufst.h,v 3.9 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _MULTIBUFST_H_ #define _MULTIBUFST_H_ @@ -435,21 +435,15 @@ extern int MultibufferWindowIndex; extern RESTYPE MultibufferDrawableResType; extern void MultibufferUpdate( /* pMbuffer, time */ -#if NeedFunctionPrototypes MultibufferPtr /* pMultibuffer */, CARD32 /* time */ -#endif ); extern void MultibufferExpose( /* pMbuffer, pRegion */ -#if NeedFunctionPrototypes MultibufferPtr /* pMultibuffer */, RegionPtr /* pRegion */ -#endif ); extern void MultibufferClobber( /* pMbuffer */ -#if NeedFunctionPrototypes MultibufferPtr /* pMultibuffer */ -#endif ); typedef struct _mbufWindow *mbufWindowPtr; @@ -515,61 +509,43 @@ typedef struct _mbufScreen { xMbufBufferInfo *pInfo; /* buffer info (for Normal buffers) */ int (* CreateImageBuffers)( -#if NeedNestedPrototypes WindowPtr /* pWin */, int /* nbuf */, XID * /* ids */, int /* action */, int /* hint */ -#endif ); void (* DestroyImageBuffers)( -#if NeedNestedPrototypes WindowPtr /* pWin */ -#endif ); void (* DisplayImageBuffers)( -#if NeedNestedPrototypes ScreenPtr /* pScreen */, mbufBufferPtr * /* ppMBBuffer */, mbufWindowPtr * /* ppMBWindow */, int /* nbuf */ -#endif ); void (* ClearImageBufferArea)( -#if NeedNestedPrototypes mbufBufferPtr /* pMBBuffer */, short /* x */, short /* y */, unsigned short /* width */, unsigned short /* height */, Bool /* exposures */ -#endif ); Bool (* ChangeMBufferAttributes)( /* pMBWindow, vmask */ -#if NeedNestedPrototypes /* FIXME */ -#endif ); Bool (* ChangeBufferAttributes)( /* pMBBuffer, vmask */ -#if NeedNestedPrototypes /* FIXME */ -#endif ); void (* DeleteBufferDrawable)( -#if NeedNestedPrototypes DrawablePtr /* pDrawable */ -#endif ); void (* WrapScreenFuncs)( -#if NeedNestedPrototypes ScreenPtr /* pScreen */ -#endif ); void (* ResetProc)( -#if NeedNestedPrototypes ScreenPtr /* pScreen */ -#endif ); DevUnion devPrivate; } mbufScreenRec, *mbufScreenPtr; diff --git a/shape.h b/shape.h index a590a27..b9d3f4a 100644 --- a/shape.h +++ b/shape.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shape.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -76,23 +76,18 @@ typedef struct { _XFUNCPROTOBEGIN extern Bool XShapeQueryExtension ( -#if NeedFunctionPrototypes Display* /* display */, int* /* event_base */, int* /* error_base */ -#endif ); extern Status XShapeQueryVersion ( -#if NeedFunctionPrototypes Display* /* display */, int* /* major_version */, int* /* minor_version */ -#endif ); extern void XShapeCombineRegion ( -#if NeedFunctionPrototypes Display* /* display */, Window /* dest */, int /* dest_kind */, @@ -100,11 +95,9 @@ extern void XShapeCombineRegion ( int /* y_off */, Region /* region */, int /* op */ -#endif ); extern void XShapeCombineRectangles ( -#if NeedFunctionPrototypes Display* /* display */, Window /* dest */, int /* dest_kind */, @@ -114,11 +107,9 @@ extern void XShapeCombineRectangles ( int /* n_rects */, int /* op */, int /* ordering */ -#endif ); extern void XShapeCombineMask ( -#if NeedFunctionPrototypes Display* /* display */, Window /* dest */, int /* dest_kind */, @@ -126,11 +117,9 @@ extern void XShapeCombineMask ( int /* y_off */, Pixmap /* src */, int /* op */ -#endif ); extern void XShapeCombineShape ( -#if NeedFunctionPrototypes Display* /* display */, Window /* dest */, int /* dest_kind */, @@ -139,21 +128,17 @@ extern void XShapeCombineShape ( Window /* src */, int /* src_kind */, int /* op */ -#endif ); extern void XShapeOffsetShape ( -#if NeedFunctionPrototypes Display* /* display */, Window /* dest */, int /* dest_kind */, int /* x_off */, int /* y_off */ -#endif ); extern Status XShapeQueryExtents ( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, Bool* /* bounding_shaped */, @@ -166,32 +151,25 @@ extern Status XShapeQueryExtents ( int* /* y_clip */, unsigned int* /* w_clip */, unsigned int* /* h_clip */ -#endif ); extern void XShapeSelectInput ( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, unsigned long /* mask */ -#endif ); extern unsigned long XShapeInputSelected ( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */ -#endif ); extern XRectangle *XShapeGetRectangles ( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, int /* kind */, int* /* count */, int* /* ordering */ -#endif ); _XFUNCPROTOEND diff --git a/shmstr.h b/shmstr.h index a445413..a175b23 100644 --- a/shmstr.h +++ b/shmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shmstr.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group. #define SHM_MINOR_VERSION 1 #ifdef _XSHM_SERVER_ -#if NeedFunctionPrototypes #define XSHM_PUT_IMAGE_ARGS \ DrawablePtr /* dst */, \ GCPtr /* pGC */, \ @@ -61,20 +60,13 @@ in this Software without prior written authorization from The Open Group. int /* dx */, \ int /* dy */, \ char * /* data */ -#else -#define XSHM_PUT_IMAGE_ARGS /* nothing */ -#endif -#if NeedFunctionPrototypes #define XSHM_CREATE_PIXMAP_ARGS \ ScreenPtr /* pScreen */, \ int /* width */, \ int /* height */, \ int /* depth */, \ char * /* addr */ -#else -#define XSHM_CREATE_PIXMAP_ARGS /* nothing */ -#endif typedef struct _ShmFuncs { PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); diff --git a/sync.h b/sync.h index e2f9fe6..a14ae47 100644 --- a/sync.h +++ b/sync.h @@ -48,7 +48,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ +/* $XFree86: xc/include/extensions/sync.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _SYNC_H_ #define _SYNC_H_ @@ -139,113 +139,81 @@ typedef struct _XSyncValue { /* have to put these prototypes before the corresponding macro definitions */ extern void XSyncIntToValue( -#if NeedFunctionPrototypes XSyncValue* /*pv*/, int /*i*/ -#endif ); extern void XSyncIntsToValue( -#if NeedFunctionPrototypes XSyncValue* /*pv*/, unsigned int /*l*/, int /*h*/ -#endif ); extern Bool XSyncValueGreaterThan( -#if NeedFunctionPrototypes XSyncValue /*a*/, XSyncValue /*b*/ -#endif ); extern Bool XSyncValueLessThan( -#if NeedFunctionPrototypes XSyncValue /*a*/, XSyncValue /*b*/ -#endif ); extern Bool XSyncValueGreaterOrEqual( -#if NeedFunctionPrototypes XSyncValue /*a*/, XSyncValue /*b*/ -#endif ); extern Bool XSyncValueLessOrEqual( -#if NeedFunctionPrototypes XSyncValue /*a*/, XSyncValue /*b*/ -#endif ); extern Bool XSyncValueEqual( -#if NeedFunctionPrototypes XSyncValue /*a*/, XSyncValue /*b*/ -#endif ); extern Bool XSyncValueIsNegative( -#if NeedFunctionPrototypes XSyncValue /*v*/ -#endif ); extern Bool XSyncValueIsZero( -#if NeedFunctionPrototypes XSyncValue /*a*/ -#endif ); extern Bool XSyncValueIsPositive( -#if NeedFunctionPrototypes XSyncValue /*v*/ -#endif ); extern unsigned int XSyncValueLow32( -#if NeedFunctionPrototypes XSyncValue /*v*/ -#endif ); extern int XSyncValueHigh32( -#if NeedFunctionPrototypes XSyncValue /*v*/ -#endif ); extern void XSyncValueAdd( -#if NeedFunctionPrototypes XSyncValue* /*presult*/, XSyncValue /*a*/, XSyncValue /*b*/, int* /*poverflow*/ -#endif ); extern void XSyncValueSubtract( -#if NeedFunctionPrototypes XSyncValue* /*presult*/, XSyncValue /*a*/, XSyncValue /*b*/, int* /*poverflow*/ -#endif ); extern void XSyncMaxValue( -#if NeedFunctionPrototypes XSyncValue* /*pv*/ -#endif ); extern void XSyncMinValue( -#if NeedFunctionPrototypes XSyncValue* /*pv*/ -#endif ); _XFUNCPROTOEND @@ -404,126 +372,94 @@ typedef struct { _XFUNCPROTOBEGIN extern Status XSyncQueryExtension( -#if NeedFunctionPrototypes Display* /*dpy*/, int* /*event_base_return*/, int* /*error_base_return*/ -#endif ); extern Status XSyncInitialize( -#if NeedFunctionPrototypes Display* /*dpy*/, int* /*major_version_return*/, int* /*minor_version_return*/ -#endif ); extern XSyncSystemCounter *XSyncListSystemCounters( -#if NeedFunctionPrototypes Display* /*dpy*/, int* /*n_counters_return*/ -#endif ); extern void XSyncFreeSystemCounterList( -#if NeedFunctionPrototypes XSyncSystemCounter* /*list*/ -#endif ); extern XSyncCounter XSyncCreateCounter( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncValue /*initial_value*/ -#endif ); extern Status XSyncSetCounter( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncCounter /*counter*/, XSyncValue /*value*/ -#endif ); extern Status XSyncChangeCounter( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncCounter /*counter*/, XSyncValue /*value*/ -#endif ); extern Status XSyncDestroyCounter( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncCounter /*counter*/ -#endif ); extern Status XSyncQueryCounter( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncCounter /*counter*/, XSyncValue* /*value_return*/ -#endif ); extern Status XSyncAwait( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncWaitCondition* /*wait_list*/, int /*n_conditions*/ -#endif ); extern XSyncAlarm XSyncCreateAlarm( -#if NeedFunctionPrototypes Display* /*dpy*/, unsigned long /*values_mask*/, XSyncAlarmAttributes* /*values*/ -#endif ); extern Status XSyncDestroyAlarm( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncAlarm /*alarm*/ -#endif ); extern Status XSyncQueryAlarm( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncAlarm /*alarm*/, XSyncAlarmAttributes* /*values_return*/ -#endif ); extern Status XSyncChangeAlarm( -#if NeedFunctionPrototypes Display* /*dpy*/, XSyncAlarm /*alarm*/, unsigned long /*values_mask*/, XSyncAlarmAttributes* /*values*/ -#endif ); extern Status XSyncSetPriority( -#if NeedFunctionPrototypes Display* /*dpy*/, XID /*client_resource_id*/, int /*priority*/ -#endif ); extern Status XSyncGetPriority( -#if NeedFunctionPrototypes Display* /*dpy*/, XID /*client_resource_id*/, int* /*return_priority*/ -#endif ); #endif /* _SYNC_SERVER */ diff --git a/syncstr.h b/syncstr.h index fdabb12..6479bb3 100644 --- a/syncstr.h +++ b/syncstr.h @@ -48,6 +48,10 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/include/extensions/syncstr.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ + +#ifndef _SYNCSTR_H_ +#define _SYNCSTR_H_ #include "sync.h" @@ -392,17 +396,13 @@ typedef struct _SysCounterInfo { CARD64 bracket_less; SyncCounterType counterType; /* how can this counter change */ void (*QueryValue)( -#if NeedNestedPrototypes pointer /*pCounter*/, CARD64 * /*freshvalue*/ -#endif ); void (*BracketValues)( -#if NeedNestedPrototypes pointer /*pCounter*/, CARD64 * /*lessthan*/, CARD64 * /*greaterthan*/ -#endif ); } SysCounterInfo; @@ -415,20 +415,14 @@ typedef struct _SyncTrigger { unsigned int test_type; /* transition or Comparision type */ CARD64 test_value; /* trigger event threshold value */ Bool (*CheckTrigger)( -#if NeedNestedPrototypes struct _SyncTrigger * /*pTrigger*/, CARD64 /*newval*/ -#endif ); void (*TriggerFired)( -#if NeedNestedPrototypes struct _SyncTrigger * /*pTrigger*/ -#endif ); void (*CounterDestroyed)( -#if NeedNestedPrototypes struct _SyncTrigger * /*pTrigger*/ -#endif ); } SyncTrigger; @@ -472,28 +466,29 @@ typedef union { extern pointer SyncCreateSystemCounter( -#if NeedFunctionPrototypes char * /* name */, CARD64 /* inital_value */, CARD64 /* resolution */, SyncCounterType /* change characterization */, - void (* /*QueryValue*/ ) (), /* XXX prototype */ - void (* /*BracketValues*/) () -#endif + void (* /*QueryValue*/ ) ( + pointer /* pCounter */, + CARD64 * /* pValue_return */), /* XXX prototype */ + void (* /*BracketValues*/) ( + pointer /* pCounter */, + CARD64 * /* pbracket_less */, + CARD64 * /* pbracket_greater */) ); extern void SyncChangeCounter( -#if NeedFunctionPrototypes SyncCounter * /* pCounter*/, CARD64 /* new_value */ -#endif ); extern void SyncDestroySystemCounter( -#if NeedFunctionPrototypes pointer pCounter -#endif ); -extern void InitServertime(); +extern void InitServertime(void); #endif /* _SYNC_SERVER */ + +#endif /* _SYNCSTR_H_ */ -- cgit v1.2.1