diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
commit | 99a0cba679efb900ec8e379c35cacaea6064d913 (patch) | |
tree | 19499806f6f350acebae7810f1062bb4858e52e5 | |
parent | 0d3d2607404af7f6e059fab64caea39dc34e391e (diff) |
merge XFree86 4.3.0.1 to -CURRENT
-rw-r--r-- | man/DBE.man | 7 | ||||
-rw-r--r-- | man/XShape.man | 9 | ||||
-rw-r--r-- | man/XdbeAllocateBackBufferName.man | 9 | ||||
-rw-r--r-- | man/XdbeBeginIdiom.man | 9 | ||||
-rw-r--r-- | man/XdbeDeallocateBackBufferName.man | 9 | ||||
-rw-r--r-- | man/XdbeEndIdiom.man | 9 | ||||
-rw-r--r-- | man/XdbeFreeVisualInfo.man | 9 | ||||
-rw-r--r-- | man/XdbeGetBackBufferAttributes.man | 9 | ||||
-rw-r--r-- | man/XdbeGetVisualInfo.man | 11 | ||||
-rw-r--r-- | man/XdbeQueryExtension.man | 9 | ||||
-rw-r--r-- | man/XdbeSwapBuffers.man | 9 | ||||
-rw-r--r-- | man/Xevi.man | 9 | ||||
-rw-r--r-- | man/Xmbuf.man | 9 | ||||
-rw-r--r-- | src/DPMS.c | 58 | ||||
-rw-r--r-- | src/MITMisc.c | 13 | ||||
-rw-r--r-- | src/XAppgroup.c | 31 | ||||
-rw-r--r-- | src/XEVI.c | 11 | ||||
-rw-r--r-- | src/XLbx.c | 23 | ||||
-rw-r--r-- | src/XMultibuf.c | 10 | ||||
-rw-r--r-- | src/XSecurity.c | 45 | ||||
-rw-r--r-- | src/XShape.c | 25 | ||||
-rw-r--r-- | src/XShm.c | 38 | ||||
-rw-r--r-- | src/XSync.c | 36 | ||||
-rw-r--r-- | src/XTestExt1.c | 2 | ||||
-rw-r--r-- | src/Xcup.c | 11 | ||||
-rw-r--r-- | src/Xdbe.c | 18 | ||||
-rw-r--r-- | src/extutil.c | 15 | ||||
-rw-r--r-- | src/globals.c | 8 |
28 files changed, 242 insertions, 219 deletions
diff --git a/man/DBE.man b/man/DBE.man index bf36222..b13427c 100644 --- a/man/DBE.man +++ b/man/DBE.man @@ -1,4 +1,4 @@ -.\" $Xorg: DBE.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: DBE.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,7 +24,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH DBE 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/DBE.man,v 3.4 2001/01/27 18:20:19 dawes Exp $ +.\" +.TH DBE 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME DBE - Double Buffer Extension .SH SYNOPSIS diff --git a/man/XShape.man b/man/XShape.man index cd4df57..41358a8 100644 --- a/man/XShape.man +++ b/man/XShape.man @@ -1,4 +1,4 @@ -.\" $Xorg: XShape.man,v 1.4 2001/03/16 17:49:24 pookie Exp $ +.\" $Xorg: XShape.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ .\" .\" Copyright (c) 1989, 1994 X Consortium .\" @@ -24,17 +24,20 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.3 2001/02/07 22:35:21 tsi Exp $ +.\" .de ZN .ie t \fB\^\\$1\^\fR\\$2 .el \fI\^\\$1\^\fP\\$2 .. -.TH XSHAPE 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.TH XSHAPE 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XShapeQueryExtension, XShapeQueryVersion, XShapeCombineRegion, XShapeCombineRectangles, XShapeCombineMask, XShapeCombineShape, XShapeOffsetShape, XShapeQueryExtents, XShapeSelectInput, XShapeInputSelected, XShapeGetRectangles \- X nonrectangular shape functions .SH SYNTAX .nf .LP -#include <X11/extensions/shape.h> +\&#include <X11/extensions/shape.h> .LP Bool XShapeQueryExtension ( Display *dpy, diff --git a/man/XdbeAllocateBackBufferName.man b/man/XdbeAllocateBackBufferName.man index b1bcadf..7d1d76d 100644 --- a/man/XdbeAllocateBackBufferName.man +++ b/man/XdbeAllocateBackBufferName.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeAllo.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeAllo.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeAllocateBackBufferName 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeAllo.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeAllocateBackBufferName 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeAllocateBackBufferName - allocates a DBE buffer. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> XdbeBackBuffer XdbeAllocateBackBufferName( Display *dpy, diff --git a/man/XdbeBeginIdiom.man b/man/XdbeBeginIdiom.man index 686147a..e52d11c 100644 --- a/man/XdbeBeginIdiom.man +++ b/man/XdbeBeginIdiom.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeBegi.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeBegi.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH DBE 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH DBE 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeBeginIdiom - marks the beginning of a DBE idiom sequence. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> Status XdbeBeginIdiom( Display *dpy) diff --git a/man/XdbeDeallocateBackBufferName.man b/man/XdbeDeallocateBackBufferName.man index df58dd2..f0cbd5a 100644 --- a/man/XdbeDeallocateBackBufferName.man +++ b/man/XdbeDeallocateBackBufferName.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeDeal.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeDeal.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeDeallocateBackBufferName 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeDeal.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeDeallocateBackBufferName 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeDeallocateBackBufferName - frees a DBE buffer. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> Status XdbeDeallocateBackBufferName( Display *dpy, diff --git a/man/XdbeEndIdiom.man b/man/XdbeEndIdiom.man index ffacb50..fd4e8df 100644 --- a/man/XdbeEndIdiom.man +++ b/man/XdbeEndIdiom.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeEndI.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeEndI.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeEndIdiom 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeEndI.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeEndIdiom 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeEndIdiom - marks the end of a DBE idiom sequence. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> Status XdbeEndIdiom( Display *dpy) diff --git a/man/XdbeFreeVisualInfo.man b/man/XdbeFreeVisualInfo.man index 2792067..c6cdb31 100644 --- a/man/XdbeFreeVisualInfo.man +++ b/man/XdbeFreeVisualInfo.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeFree.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeFree.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,12 +24,15 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeFreeVisualInfo 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeFree.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeFreeVisualInfo 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeFreeVisualInfo - frees information returned by .B XdbeGetVisualInfo(). .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> void XdbeFreeVisualInfo( XdbeScreenVisualInfo *visual_info) diff --git a/man/XdbeGetBackBufferAttributes.man b/man/XdbeGetBackBufferAttributes.man index c1b1856..4d40e57 100644 --- a/man/XdbeGetBackBufferAttributes.man +++ b/man/XdbeGetBackBufferAttributes.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeGetB.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeGetB.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeGetBackBufferAttributes 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetB.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeGetBackBufferAttributes 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeGetBackBufferAttributes - returns attributes of a DBE buffer. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> XdbeBackBufferAttributes *XdbeGetBackBufferAttributes( Display *dpy, diff --git a/man/XdbeGetVisualInfo.man b/man/XdbeGetVisualInfo.man index 31204c5..ee77cb4 100644 --- a/man/XdbeGetVisualInfo.man +++ b/man/XdbeGetVisualInfo.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeGetV.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeGetV.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeGetVisualInfo 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetV.man,v 3.6 2001/06/26 15:13:06 herrb Exp $ +.\" +.TH XdbeGetVisualInfo 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME -XdbeGetVisualInfo +XdbeGetVisualInfo - Get dbe Visual Informations .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> XdbeScreenVisualInfo *XdbeGetVisualInfo( Display *dpy, diff --git a/man/XdbeQueryExtension.man b/man/XdbeQueryExtension.man index 3bae215..08adadc 100644 --- a/man/XdbeQueryExtension.man +++ b/man/XdbeQueryExtension.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeQuer.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeQuer.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeQueryExtension 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeQuer.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeQueryExtension 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeQueryExtension - returns the version of DBE supported by the server. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> Status XdbeQueryExtension( Display *dpy, diff --git a/man/XdbeSwapBuffers.man b/man/XdbeSwapBuffers.man index 782afba..0795cd8 100644 --- a/man/XdbeSwapBuffers.man +++ b/man/XdbeSwapBuffers.man @@ -1,4 +1,4 @@ -.\" $Xorg: XdbeSwap.man,v 1.4 2001/03/16 17:49:55 pookie Exp $ +.\" $Xorg: XdbeSwap.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. -.TH XdbeSwapBuffers 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeSwap.man,v 3.5 2001/02/07 22:35:22 tsi Exp $ +.\" +.TH XdbeSwapBuffers 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XdbeSwapBuffers - swaps front and back DBE buffers. .SH SYNOPSIS -#include <X11/extensions/Xdbe.h> +\&#include <X11/extensions/Xdbe.h> Status XdbeSwapBuffers( Display *dpy, diff --git a/man/Xevi.man b/man/Xevi.man index 4cdd16e..efcf608 100644 --- a/man/Xevi.man +++ b/man/Xevi.man @@ -1,4 +1,4 @@ -.\" $Xorg: Xevi.man,v 1.4 2001/03/16 17:49:24 pookie Exp $ +.\" $Xorg: Xevi.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ .\" .\" Copyright (c) 1997 Silicon Graphics, Inc. .\" @@ -24,11 +24,14 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from .\" Silicon Graphics, Inc. -.TH XEVI 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.\" +.\" $XFree86: xc/doc/man/Xext/Xevi.man,v 1.3 2001/02/07 22:35:21 tsi Exp $ +.\" +.TH XEVI 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XeviQueryExtension, XeviQueryVersion, XeviGetVisualInfo - X Extended Visual Information functions .SH SYNOPSIS -#include <X11/extensions/XEVI.h> +\&#include <X11/extensions/XEVI.h> Bool XeviQueryExtension (Display *dpy); diff --git a/man/Xmbuf.man b/man/Xmbuf.man index 842c26f..4a450dd 100644 --- a/man/Xmbuf.man +++ b/man/Xmbuf.man @@ -1,4 +1,4 @@ -.\" $Xorg: Xmbuf.man,v 1.4 2001/03/16 17:49:24 pookie Exp $ +.\" $Xorg: Xmbuf.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ .\" Copyright (c) 1989, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -33,17 +33,20 @@ .\" this document. This documentation is provided "as is" .\" without express or implied warranty. .\" +.\" +.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.3 2001/02/07 22:35:21 tsi Exp $ +.\" .de ZN .ie t \fB\^\\$1\^\fR\\$2 .el \fI\^\\$1\^\fP\\$2 .. -.TH XMBUF 3X11 "Release 6.6" "X Version 11" "X FUNCTIONS" +.TH XMBUF 3X11 __xorgversion__ "X FUNCTIONS" .SH NAME XmbufQueryExtension, XmbufGetVersion, XmbufCreateBuffers, XmbufDestroyBuffers, XmbufDisplayBuffers, XmbufGetWindowAttributes, XmbufChangeWindowAttributes, XmbufGetBufferAttributes, XmbufChangeBufferAttributes, XmbufGetScreenInfo, XmbufCreateStereoWindow - X multibuffering functions .SH SYNTAX .nf .LP -#include <X11/extensions/multibuf.h> +\&#include <X11/extensions/multibuf.h> .LP Bool XmbufQueryExtension( Display *dpy, @@ -26,18 +26,19 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ +/* $XFree86: xc/lib/Xext/DPMS.c,v 3.6 2002/10/16 02:19:22 dawes Exp $ */ /* * HISTORY */ #define NEED_REPLIES -#include "Xlibint.h" -#include "dpms.h" -#include "dpmsstr.h" -#include "Xext.h" -#include "extutil.h" -#include "stdio.h" +#include <X11/Xlibint.h> +#include <X11/extensions/dpms.h> +#include <X11/extensions/dpmsstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> +#include <stdio.h> static XExtensionInfo _dpms_info_data; static XExtensionInfo *dpms_info = &_dpms_info_data; @@ -52,7 +53,7 @@ static char *dpms_extension_name = DPMSExtensionName; * * *****************************************************************************/ -static int close_display(); +static int close_display(Display *dpy, XExtCodes *codes); static /* const */ XExtensionHooks dpms_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -80,9 +81,8 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, dpms_info) * * *****************************************************************************/ -Bool DPMSQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; +Bool +DPMSQueryExtension (Display *dpy, int *event_basep, int *error_basep) { XExtDisplayInfo *info = find_display (dpy); @@ -95,9 +95,8 @@ Bool DPMSQueryExtension (dpy, event_basep, error_basep) } } -Status DPMSGetVersion(dpy, major_versionp, minor_versionp) - Display *dpy; - int *major_versionp, *minor_versionp; +Status +DPMSGetVersion(Display *dpy, int *major_versionp, int *minor_versionp) { XExtDisplayInfo *info = find_display (dpy); xDPMSGetVersionReply rep; @@ -121,8 +120,8 @@ Status DPMSGetVersion(dpy, major_versionp, minor_versionp) return 1; } -Bool DPMSCapable(dpy) - Display *dpy; +Bool +DPMSCapable(Display *dpy) { XExtDisplayInfo *info = find_display (dpy); register xDPMSCapableReq *req; @@ -145,9 +144,8 @@ Bool DPMSCapable(dpy) return rep.capable; } -Status DPMSSetTimeouts(dpy, standby, suspend, off) - Display *dpy; - CARD16 standby, suspend, off; +Status +DPMSSetTimeouts(Display *dpy, CARD16 standby, CARD16 suspend, CARD16 off) { XExtDisplayInfo *info = find_display (dpy); register xDPMSSetTimeoutsReq *req; @@ -175,9 +173,8 @@ Status DPMSSetTimeouts(dpy, standby, suspend, off) return 1; } -Bool DPMSGetTimeouts(dpy, standby, suspend, off) - Display *dpy; - CARD16 *standby, *suspend, *off; +Bool +DPMSGetTimeouts(Display *dpy, CARD16 *standby, CARD16 *suspend, CARD16 *off) { XExtDisplayInfo *info = find_display (dpy); register xDPMSGetTimeoutsReq *req; @@ -203,8 +200,8 @@ Bool DPMSGetTimeouts(dpy, standby, suspend, off) return 1; } -Status DPMSEnable(dpy) - Display *dpy; +Status +DPMSEnable(Display *dpy) { XExtDisplayInfo *info = find_display (dpy); register xDPMSEnableReq *req; @@ -220,8 +217,8 @@ Status DPMSEnable(dpy) return 1; } -Status DPMSDisable(dpy) - Display *dpy; +Status +DPMSDisable(Display *dpy) { XExtDisplayInfo *info = find_display (dpy); register xDPMSDisableReq *req; @@ -238,9 +235,8 @@ Status DPMSDisable(dpy) } -Status DPMSForceLevel(dpy, level) - Display *dpy; - CARD16 level; +Status +DPMSForceLevel(Display *dpy, CARD16 level) { XExtDisplayInfo *info = find_display (dpy); register xDPMSForceLevelReq *req; @@ -264,10 +260,8 @@ Status DPMSForceLevel(dpy, level) return 1; } -Status DPMSInfo(dpy, power_level, state) - Display *dpy; - CARD16 *power_level; - BOOL *state; +Status +DPMSInfo(Display *dpy, CARD16 *power_level, BOOL *state) { XExtDisplayInfo *info = find_display (dpy); register xDPMSInfoReq *req; diff --git a/src/MITMisc.c b/src/MITMisc.c index 810e5cb..21bb5ef 100644 --- a/src/MITMisc.c +++ b/src/MITMisc.c @@ -24,15 +24,16 @@ 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/lib/Xext/MITMisc.c,v 1.4 2002/10/16 02:19:22 dawes Exp $ */ /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */ #define NEED_REPLIES -#include "Xlibint.h" -#include "MITMisc.h" -#include "mitmiscstr.h" -#include "Xext.h" -#include "extutil.h" +#include <X11/Xlibint.h> +#include <X11/extensions/MITMisc.h> +#include <X11/extensions/mitmiscstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> static XExtensionInfo _mit_info_data; static XExtensionInfo *mit_info = &_mit_info_data; @@ -47,7 +48,7 @@ static /* const */ char *mit_extension_name = MITMISCNAME; * * *****************************************************************************/ -static int close_display(); +static int close_display(Display *dpy, XExtCodes *codes); static /* const */ XExtensionHooks mit_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ diff --git a/src/XAppgroup.c b/src/XAppgroup.c index 915d989..fc61f03 100644 --- a/src/XAppgroup.c +++ b/src/XAppgroup.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.11 2002/10/16 02:19:22 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -37,16 +38,12 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #define NEED_REPLIES -#include "Xlibint.h" -#include "Xagstr.h" -#include "Xext.h" -#include "extutil.h" +#include <X11/Xlibint.h> +#include <X11/extensions/Xagstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> -#if NeedVarargsPrototypes -#define Va_start(a,b) va_start(a,b) -#else -#define Va_start(a,b) va_start(a) -#endif +#include <stdarg.h> struct xagstuff { int attrib_mask; @@ -72,7 +69,7 @@ static char *xag_extension_name = XAGNAME; * * *****************************************************************************/ -static int close_display(); +static int close_display(Display *dpy, XExtCodes *codes); static /* const */ XExtensionHooks xag_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -132,10 +129,7 @@ XagQueryVersion(dpy, major_version_return, minor_version_return) } static void -StuffToWire (dpy, stuff, req) - Display* dpy; - struct xagstuff* stuff; - xXagCreateReq* req; +StuffToWire (Display *dpy, struct xagstuff *stuff, xXagCreateReq *req) { unsigned long values[8]; unsigned long* value = values; @@ -272,17 +266,10 @@ Bool XagDestroyApplicationGroup(dpy,app_group) } Bool -#if NeedVarargsPrototypes XagGetApplicationGroupAttributes( Display* dpy, XAppGroup app_group, ...) -#else -XagGetApplicationGroupAttributes(dpy, app_group, va_alist) - Display* dpy; - XAppGroup app_group; - va_dcl -#endif { va_list var; XExtDisplayInfo *info = find_display (dpy); @@ -302,7 +289,7 @@ XagGetApplicationGroupAttributes(dpy, app_group, va_alist) SyncHandle(); return False; } - Va_start (var, app_group); + va_start (var, app_group); for (attr = va_arg(var, int); attr != 0; attr = va_arg(var, int)) { void* ptr; @@ -21,13 +21,14 @@ 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/lib/Xext/XEVI.c,v 1.7 2002/10/16 00:37:27 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES -#include "Xlibint.h" -#include "XEVI.h" -#include "XEVIstr.h" -#include "Xext.h" -#include "extutil.h" +#include <X11/Xlibint.h> +#include <X11/extensions/XEVI.h> +#include <X11/extensions/XEVIstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> #include <X11/Xutil.h> static XExtensionInfo *xevi_info;/* needs to move to globals.c */ static /* const */ char *xevi_extension_name = EVINAME; @@ -22,13 +22,16 @@ * * Author: Keith Packard, Network Computing Devices */ +/* $XFree86: xc/lib/Xext/XLbx.c,v 1.5 2002/10/16 02:19:22 dawes Exp $ */ + #define NEED_EVENTS #define NEED_REPLIES -#include "Xlibint.h" -#include "XLbx.h" -#include "lbxstr.h" -#include "Xext.h" -#include "extutil.h" +#include <stdio.h> +#include <X11/Xlibint.h> +#include <X11/extensions/XLbx.h> +#include <X11/extensions/lbxstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> static XExtensionInfo _lbx_info_data; static XExtensionInfo *lbx_info = &_lbx_info_data; @@ -37,10 +40,9 @@ static /* const */ char *lbx_extension_name = LBXNAME; #define LbxCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, lbx_extension_name, val) -static int close_display(); -static char *error_string(); -static Bool wire_to_event(); -static Status event_to_wire(); +static int close_display(Display *dpy, XExtCodes *codes); +static char *error_string(Display *dpy, int code, XExtCodes *codes, + char *buf, int n); static /* const */ XExtensionHooks lbx_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -85,8 +87,7 @@ Bool XLbxQueryExtension (dpy, requestp, event_basep, error_basep) } -int XLbxGetEventBase(dpy) - Display *dpy; +int XLbxGetEventBase(Display *dpy) { XExtDisplayInfo *info = find_display (dpy); diff --git a/src/XMultibuf.c b/src/XMultibuf.c index 55a1777..c12df7a 100644 --- a/src/XMultibuf.c +++ b/src/XMultibuf.c @@ -25,13 +25,15 @@ in this Software without prior written authorization from The Open Group. * * Authors: Jim Fulton, MIT X Consortium */ +/* $XFree86: xc/lib/Xext/XMultibuf.c,v 1.6 2002/10/16 00:37:27 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES #include <X11/Xlibint.h> -#include "Xext.h" /* in ../include */ -#include "extutil.h" /* in ../include */ -#include "multibufst.h" /* in ../include */ +#include <stdio.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> +#include <X11/extensions/multibufst.h> static XExtensionInfo _multibuf_info_data; static XExtensionInfo *multibuf_info = &_multibuf_info_data; @@ -421,7 +423,7 @@ Status XmbufGetWindowAttributes (dpy, w, attr) SyncHandle(); return (0); } - _XRead32 (dpy, (char *) attr->buffers, nbytes); + _XRead32 (dpy, (long *) attr->buffers, nbytes); } attr->displayed_index = rep.displayedBuffer; attr->update_action = rep.updateAction; diff --git a/src/XSecurity.c b/src/XSecurity.c index 7d0de9b..2c94709 100644 --- a/src/XSecurity.c +++ b/src/XSecurity.c @@ -24,10 +24,13 @@ 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/lib/Xext/XSecurity.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */ + #include <X11/Xlibint.h> -#include "Xext.h" -#include "extutil.h" -#include "securstr.h" +#include <stdio.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> +#include <X11/extensions/securstr.h> static XExtensionInfo _Security_info_data; static XExtensionInfo *Security_info = &_Security_info_data; @@ -51,10 +54,12 @@ static char *Security_extension_name = SECURITY_EXTENSION_NAME; /* * find_display - locate the display info block */ -static int close_display(); -static Bool wire_to_event(); -static Status event_to_wire(); -static char *error_string(); +static int close_display(Display *dpy, XExtCodes *codes); +static Bool wire_to_event(Display *dpy, XEvent *event, xEvent *wire); +static Status event_to_wire(Display *dpy, XEvent *event, xEvent *wire); +static char *error_string(Display *dpy, int code, XExtCodes *codes, + char *buf, int n); + static XExtensionHooks Security_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -75,21 +80,18 @@ static char *security_error_list[] = { }; static XEXT_GENERATE_FIND_DISPLAY (find_display, Security_info, - Security_extension_name, - &Security_extension_hooks, + Security_extension_name, + &Security_extension_hooks, XSecurityNumberEvents, NULL) static XEXT_GENERATE_CLOSE_DISPLAY (close_display, Security_info) -static +static XEXT_GENERATE_ERROR_STRING(error_string, Security_extension_name, XSecurityNumberErrors, security_error_list) -static Bool -wire_to_event(dpy, event, wire) - Display *dpy; - XEvent *event; - xEvent *wire; +static Bool +wire_to_event(Display *dpy, XEvent *event, xEvent *wire) { XExtDisplayInfo *info = find_display(dpy); @@ -101,7 +103,7 @@ wire_to_event(dpy, event, wire) { xSecurityAuthorizationRevokedEvent *rwire = (xSecurityAuthorizationRevokedEvent *)wire; - XSecurityAuthorizationRevokedEvent *revent = + XSecurityAuthorizationRevokedEvent *revent = (XSecurityAuthorizationRevokedEvent *)event; revent->type = rwire->type & 0x7F; @@ -116,11 +118,8 @@ wire_to_event(dpy, event, wire) return False; } -static Status -event_to_wire(dpy, event, wire) - Display *dpy; - XEvent *event; - xEvent *wire; +static Status +event_to_wire(Display *dpy, XEvent *event, xEvent *wire) { XExtDisplayInfo *info = find_display(dpy); @@ -132,7 +131,7 @@ event_to_wire(dpy, event, wire) { xSecurityAuthorizationRevokedEvent *rwire = (xSecurityAuthorizationRevokedEvent *)wire; - XSecurityAuthorizationRevokedEvent *revent = + XSecurityAuthorizationRevokedEvent *revent = (XSecurityAuthorizationRevokedEvent *)event; rwire->type = revent->type | (revent->send_event ? 0x80 : 0); rwire->sequenceNumber = revent->serial & 0xFFFF; @@ -297,7 +296,7 @@ XSecurityRevokeAuthorization( { XExtDisplayInfo *info = find_display (dpy); xSecurityRevokeAuthorizationReq *req; - + SecurityCheckExtension (dpy, info, 0); LockDisplay(dpy); SecurityGetReq(SecurityRevokeAuthorization, req, info); diff --git a/src/XShape.c b/src/XShape.c index ba09d68..9ec6a78 100644 --- a/src/XShape.c +++ b/src/XShape.c @@ -25,14 +25,15 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ +/* $XFree86: xc/lib/Xext/XShape.c,v 1.4 2002/10/16 02:19:22 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "region.h" /* in Xlib sources */ -#include "Xext.h" /* in ../include */ -#include "extutil.h" /* in ../include */ -#include "shapestr.h" /* in ../include */ +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> +#include <X11/extensions/shapestr.h> static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; @@ -50,9 +51,9 @@ static /* const */ char *shape_extension_name = SHAPENAME; * * *****************************************************************************/ -static int close_display(); -static Bool wire_to_event(); -static Status event_to_wire(); +static int close_display(Display *dpy, XExtCodes *codes); +static Bool wire_to_event (Display *dpy, XEvent *re, xEvent *event); +static Status event_to_wire (Display *dpy, XEvent *re, xEvent *event); static /* const */ XExtensionHooks shape_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -75,10 +76,8 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, shape_info, static XEXT_GENERATE_CLOSE_DISPLAY (close_display, shape_info) -static Bool wire_to_event (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +static Bool +wire_to_event (Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = find_display (dpy); XShapeEvent *se; @@ -109,10 +108,8 @@ static Bool wire_to_event (dpy, re, event) return False; } -static Status event_to_wire (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +static Status +event_to_wire (Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = find_display (dpy); XShapeEvent *se; @@ -25,16 +25,18 @@ in this Software without prior written authorization from The Open Group. * * Author: Bob Scheifler and Keith Packard, MIT X Consortium */ +/* $XFree86: xc/lib/Xext/XShm.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ #define NEED_EVENTS #define NEED_REPLIES -#include "Xlibint.h" -#include "XShm.h" -#include "shmstr.h" -#include "Xext.h" -#include "extutil.h" +#include <stdio.h> +#include <X11/Xlibint.h> +#include <X11/extensions/XShm.h> +#include <X11/extensions/shmstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> static XExtensionInfo _shm_info_data; static XExtensionInfo *shm_info = &_shm_info_data; @@ -49,10 +51,16 @@ static /* const */ char *shm_extension_name = SHMNAME; * * *****************************************************************************/ -static int close_display(); -static char *error_string(); -static Bool wire_to_event(); -static Status event_to_wire(); +/* in X11/ImUtil.c */ +extern int _XGetScanlinePad(); +extern int _XGetBitsPerPixel(); +extern void _XInitImageFuncPtrs(); + +static int close_display(Display *dpy, XExtCodes *codes); +static char *error_string(Display *dpy, int code, XExtCodes *codes, + char *buf, int n); +static Bool wire_to_event (Display *dpy, XEvent *re, xEvent *event); +static Status event_to_wire (Display *dpy, XEvent *re, xEvent *event); static /* const */ XExtensionHooks shm_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -80,10 +88,8 @@ static XEXT_GENERATE_ERROR_STRING (error_string, shm_extension_name, ShmNumberErrors, shm_error_list) -static Bool wire_to_event (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +static Bool +wire_to_event (Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = find_display (dpy); XShmCompletionEvent *se; @@ -109,10 +115,8 @@ static Bool wire_to_event (dpy, re, event) return False; } -static Status event_to_wire (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +static Status +event_to_wire (Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = find_display (dpy); XShmCompletionEvent *se; diff --git a/src/XSync.c b/src/XSync.c index fe17698..308089f 100644 --- a/src/XSync.c +++ b/src/XSync.c @@ -50,14 +50,15 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xext/XSync.c,v 1.7 2002/10/16 02:19:22 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS #define NEED_REPLIES -#include "Xlibint.h" -#include "Xext.h" -#include "extutil.h" -#include "syncstr.h" +#include <X11/Xlibint.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> +#include <X11/extensions/syncstr.h> static XExtensionInfo _sync_info_data; static XExtensionInfo *sync_info = &_sync_info_data; @@ -68,10 +69,11 @@ static char *sync_extension_name = SYNC_NAME; #define SyncSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension(dpy, i, sync_extension_name) -static int close_display(); -static Bool wire_to_event(); -static Status event_to_wire(); -static char *error_string(); +static int close_display(Display *dpy, XExtCodes *codes); +static Bool wire_to_event(Display *dpy, XEvent *event, xEvent *wire); +static Status event_to_wire(Display *dpy, XEvent *event, xEvent *wire); +static char *error_string(Display *dpy, int code, XExtCodes *codes, + char *buf, int n); static XExtensionHooks sync_extension_hooks = { NULL, /* create_gc */ @@ -107,10 +109,7 @@ XEXT_GENERATE_ERROR_STRING(error_string, sync_extension_name, static Bool -wire_to_event(dpy, event, wire) - Display *dpy; - XEvent *event; - xEvent *wire; +wire_to_event(Display *dpy, XEvent *event, xEvent *wire) { XExtDisplayInfo *info = find_display(dpy); XSyncCounterNotifyEvent *aevent; @@ -165,10 +164,7 @@ wire_to_event(dpy, event, wire) } static Status -event_to_wire(dpy, event, wire) - Display *dpy; - XEvent *event; - xEvent *wire; +event_to_wire(Display *dpy, XEvent *event, xEvent *wire) { XExtDisplayInfo *info = find_display(dpy); XSyncCounterNotifyEvent *aevent; @@ -513,11 +509,9 @@ XSyncAwait(dpy, wait_list, n_conditions) } static void -_XProcessAlarmAttributes(dpy, req, valuemask, attributes) - Display *dpy; - xSyncChangeAlarmReq *req; - unsigned long valuemask; - XSyncAlarmAttributes *attributes; +_XProcessAlarmAttributes(Display *dpy, xSyncChangeAlarmReq *req, + unsigned long valuemask, + XSyncAlarmAttributes *attributes) { unsigned long values[32]; diff --git a/src/XTestExt1.c b/src/XTestExt1.c index ddd3e29..d7c8014 100644 --- a/src/XTestExt1.c +++ b/src/XTestExt1.c @@ -51,6 +51,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ +/* $XFree86: xc/lib/Xext/XTestExt1.c,v 1.4 2001/12/14 19:55:01 dawes Exp $ */ /****************************************************************************** * include files @@ -59,6 +60,7 @@ University of California. #define NEED_REPLIES #define NEED_EVENTS +#include <stdio.h> #include <X11/Xproto.h> #include <X11/Xlibint.h> #include <X11/extensions/xtestext1.h> @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/Xext/Xcup.c,v 1.8 2002/10/16 02:19:22 dawes Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group @@ -37,10 +38,10 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #define NEED_REPLIES -#include "Xlibint.h" -#include "Xcupstr.h" -#include "Xext.h" -#include "extutil.h" +#include <X11/Xlibint.h> +#include <X11/extensions/Xcupstr.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> static XExtensionInfo _xcup_info_data; static XExtensionInfo *xcup_info = &_xcup_info_data; @@ -52,7 +53,7 @@ static char *xcup_extension_name = XCUPNAME; * * *****************************************************************************/ -static int close_display(); +static int close_display(Display *dpy, XExtCodes *codes); static /* const */ XExtensionHooks xcup_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -30,15 +30,16 @@ * Xlib DBE code * *****************************************************************************/ - +/* $XFree86: xc/lib/Xext/Xdbe.c,v 3.7 2002/10/16 02:19:22 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES +#include <stdio.h> #include <X11/Xlibint.h> -#include "Xext.h" -#include "extutil.h" +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> #define NEED_DBE_PROTOCOL -#include "Xdbe.h" +#include <X11/extensions/Xdbe.h> static XExtensionInfo _dbe_info_data; static XExtensionInfo *dbe_info = &_dbe_info_data; @@ -49,7 +50,7 @@ static char *dbe_extension_name = DBE_PROTOCOL_NAME; #define DbeSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension (dpy, i, dbe_extension_name) -#if defined(__STDC__) && !defined(UNIXCPP) +#if !defined(UNIXCPP) #define DbeGetReq(name,req,info) GetReq (name, req); \ req->reqType = info->codes->major_opcode; \ req->dbeReqType = X_##name; @@ -69,8 +70,9 @@ static char *dbe_extension_name = DBE_PROTOCOL_NAME; /* * find_display - locate the display info block */ -static int close_display(); -static char *error_string(); +static int close_display(Display *dpy, XExtCodes *codes); +static char *error_string(Display *dpy, int code, XExtCodes *codes, + char *buf, int n); static XExtensionHooks dbe_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -429,7 +431,7 @@ XdbeScreenVisualInfo *XdbeGetVisualInfo (dpy, screen_specifiers, num_screens) int j; long c; - _XRead32 (dpy, (char *)&c, sizeof(CARD32)); + _XRead32 (dpy, &c, sizeof(CARD32)); scrVisInfo[i].count = c; nbytes = scrVisInfo[i].count * sizeof(XdbeVisualInfo); diff --git a/src/extutil.c b/src/extutil.c index 8fa6aec..8057cce 100644 --- a/src/extutil.c +++ b/src/extutil.c @@ -45,11 +45,12 @@ in this Software without prior written authorization from The Open Group. * XSetExtensionErrorHandler establish an extension error handler * XMissingExtension raise an error about missing ext */ +/* $XFree86: xc/lib/Xext/extutil.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */ #include <stdio.h> -#include "Xlibint.h" -#include "Xext.h" -#include "extutil.h" +#include <X11/Xlibint.h> +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> /* @@ -236,10 +237,10 @@ XExtDisplayInfo *XextFindDisplay (extinfo, dpy) -static int _default_exterror (dpy, ext_name, reason) - Display *dpy; - char *ext_name; - char *reason; +static int _default_exterror ( + Display *dpy, + char *ext_name, + char *reason) { fprintf (stderr, "Xlib: extension \"%s\" %s on display \"%s\".\n", ext_name, reason, DisplayString(dpy)); diff --git a/src/globals.c b/src/globals.c index 07fdeeb..8ac0a24 100644 --- a/src/globals.c +++ b/src/globals.c @@ -26,16 +26,14 @@ other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xext/globals.c,v 3.5 2001/12/14 19:55:02 dawes Exp $ */ + /* * This file should contain only those objects which must be predefined. */ #include <X11/Xlib.h> #include <X11/extensions/Xext.h> -#ifndef X_NOT_STDC_ENV #include <stddef.h> /* for definition of NULL */ -#else -#include <sys/param.h> -#endif /* * If possible, it is useful to have the global data default to a null value. @@ -52,7 +50,7 @@ from The Open Group. /* * If we need to define extra variables for each global */ -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define ZEROINIT(t,var,val) SetZero(t,var,val); \ SetZero (long, _libX_##var##Flag, 0); \ SetZero (void *, _libX_##var##Ptr, NULL) |