[xserver-commit] xserver/Xext shmint.h,NONE,1.1.2.1 syncint.h,NONE,1.1.2.1 xext.h,NONE,1.1.2.1 bigreq.c,3.7,3.7.2.1 mitmisc.c,3.6,3.6.2.1 saver.c,3.8,3.8.2.1 shm.c,3.40,3.40.2.1 sleepuntil.c,3.7,3.7.2.1 sleepuntil.h,1.2,1.2.2.1 sync.c,3.13,3.13.2.1 xcmisc.c,3.8,3.8.2.1 xres.c,1.8,1.8.2.1 xtest.c,3.9,3.9.2.1 xtest1di.c,3.5,3.5.2.1 xvmc.c,1.10,1.10.2.1 xvmcext.h,1.3,1.3.2.1

Keith Packard xserver-commit@pdx.freedesktop.org
Wed, 29 Oct 2003 08:27:01 -0800 

Committed by: keithp

Update of /cvs/xserver/xserver/Xext
In directory pdx:/tmp/cvs-serv23305/Xext

Modified Files:
      Tag: xfixes_2_branch
	bigreq.c mitmisc.c saver.c shm.c sleepuntil.c sleepuntil.h 
	sync.c xcmisc.c xres.c xtest.c xtest1di.c xvmc.c xvmcext.h 
Added Files:
      Tag: xfixes_2_branch
	shmint.h syncint.h xext.h 
Log Message:
	* Xext/bigreq.c: (BigReqExtensionInit):
	* Xext/mitmisc.c: (MITMiscExtensionInit):
	* Xext/saver.c: (ScreenSaverExtensionInit):
	* Xext/shm.c: (ShmExtensionInit), (ShmRegisterFuncs),
	(ShmSetPixmapFormat):
	* Xext/shmint.h:
	* Xext/sleepuntil.c: (ClientSleepUntil):
	* Xext/sleepuntil.h:
	* Xext/sync.c: (SyncCreateSystemCounter), (SyncExtensionInit):
	* Xext/syncint.h:
	* Xext/xcmisc.c: (XCMiscExtensionInit):
	* Xext/xext.h:
	* Xext/xres.c:
	* Xext/xtest.c: (XTestExtensionInit):
	* Xext/xtest1di.c: (XTestExtension1Init):
	* Xext/xvmc.c: (XvMCFindXvImage):
	* Xext/xvmcext.h:
	* configure.ac:
	* dix/dispatch.c:
	* dix/extension.c: (CloseDownExtensions):
	* dix/property.c: (NullPropertyReply):
	* dix/xpstubs.c: (XpClientIsBitmapClient), (XpClientIsPrintClient),
	(XprintOptions):
	* hw/kdrive/fbdev/fbdev.c: (fbdevUnmapFramebuffer),
	(fbdevRandRSetConfig):
	* hw/kdrive/fbdev/fbdev.h:
	* hw/kdrive/linux/agp.c: (GARTInit):
	* hw/kdrive/linux/bus.c:
	* hw/kdrive/linux/keyboard.c: (readKernelMapping):
	* hw/kdrive/linux/linux.c: (LinuxInit):
	* hw/kdrive/linux/mouse.c:
	* hw/kdrive/linux/ms.c:
	* hw/kdrive/linux/ps2.c:
	* hw/kdrive/mach64/mach64.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/mga/mga.c:
	* hw/kdrive/mga/mgadraw.c: (mgaPrepareSolid), (mgaPrepareCopy):
	* hw/kdrive/nvidia/nvidia.c: (nvidiaLockUnlock):
	* hw/kdrive/nvidia/nvidia.h:
	* hw/kdrive/nvidia/nvidiadraw.c: (nvidiaPrepareSolid),
	(nvidiaPrepareCopy), (nvidiaDrawInit), (nvidiaDrawEnable):
	* hw/kdrive/r128/r128.c: (r128ScreenInit), (r128Preserve),
	(r128DPMS):
	* hw/kdrive/r128/r128draw.c: (r128WaitAvail), (r128Setup),
	(r128DrawInit):
	* hw/kdrive/r128/r128stub.c:
	* hw/kdrive/smi/smi.c: (smiRandRSetConfig), (smiPreserve),
	(smiDPMS), (smiRestore):
	* hw/kdrive/smi/smi.h:
	* hw/kdrive/smi/smidraw.c: (smiPrepareSolid), (smiPrepareCopy),
	(smiDrawInit):
	* hw/kdrive/smi/smistub.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kcmap.c:
	* hw/kdrive/src/kcurscol.c:
	* hw/kdrive/src/kdrive.c: (KdCreateScreenResources):
	* hw/kdrive/src/kdrive.h:
	* hw/kdrive/src/kinput.c:
	* hw/kdrive/src/knoop.c:
	* hw/kdrive/src/vga.c:
	* hw/kdrive/src/vga.h:
	* hw/kdrive/vesa/vesa.h:
	* hw/xnest/Color.c: (xnestCreateColormap), (xnestDestroyColormap),
	(xnestCountInstalledColormapWindows),
	(xnestGetInstalledColormapWindows),
	(xnestSameInstalledColormapWindows),
	(xnestSetInstalledColormapWindows),
	(xnestSetScreenSaverColormapWindow), (xnestDirectInstallColormaps),
	(xnestDirectUninstallColormaps), (xnestInstallColormap),
	(xnestUninstallColormap), (xnestListInstalledColormaps),
	(xnestStoreColors), (xnestResolveColor),
	(xnestCreateDefaultColormap):
	* hw/xnest/Color.h:
	* hw/xnest/Cursor.c: (xnestConstrainCursor), (xnestCursorLimits),
	(xnestDisplayCursor), (xnestRealizeCursor), (xnestUnrealizeCursor),
	(xnestRecolorCursor), (xnestSetCursorPosition):
	* hw/xnest/Display.c: (xnestOpenDisplay):
	* hw/xnest/Display.h:
	* hw/xnest/Events.c: (xnestExposurePredicate),
	(xnestNotExposurePredicate), (xnestCollectExposures),
	(xnestCollectEvents):
	* hw/xnest/Events.h:
	* hw/xnest/Font.c: (xnestRealizeFont), (xnestUnrealizeFont):
	* hw/xnest/GC.c: (xnestValidateGC), (xnestChangeGC), (xnestCopyGC),
	(xnestDestroyGC), (xnestDestroyClipHelper), (xnestChangeClip),
	(xnestDestroyClip), (xnestCopyClip), (xnestCreateGC):
	* hw/xnest/GCOps.c: (xnestFillSpans), (xnestSetSpans),
	(xnestGetSpans), (xnestQueryBestSize), (xnestPutImage),
	(xnestGetImage), (xnestBitBlitPredicate), (xnestBitBlitHelper),
	(xnestCopyArea), (xnestCopyPlane), (xnestPolyPoint),
	(xnestPolylines), (xnestPolySegment), (xnestPolyRectangle),
	(xnestPolyArc), (xnestFillPolygon), (xnestPolyFillRect),
	(xnestPolyFillArc), (xnestPolyText8), (xnestPolyText16),
	(xnestImageText8), (xnestImageText16), (xnestImageGlyphBlt),
	(xnestPolyGlyphBlt), (xnestPushPixels):
	* hw/xnest/GCOps.h:
	* hw/xnest/Keyboard.h:
	* hw/xnest/Screen.c: (xnestScreen):
	* hw/xnest/Screen.h:
	* hw/xnest/Visual.c: (xnestVisual), (xnestVisualFromID):
	* hw/xnest/Visual.h:
	* hw/xnest/Window.c: (xnestWindowPtr):
	* hw/xnest/XNCursor.h:
	* hw/xnest/XNFont.h:
	* hw/xnest/XNGC.h:
	* hw/xnest/XNPixmap.h:
	* hw/xnest/XNWindow.h:
	* include/extnsionst.h:
	* mi/Makefile.am:
	* mi/miinitext.c:
	* os/Makefile.am:
	* os/connection.c: (ClientAuthorized):
	* os/hpsocket.c: (set_socket_option), (unset_socket_option):
	* os/xdmauth.c: (XdmCheckCookie), (XdmToID):
	Prototype fixes (various)
	Add GCC warnings (including -Werror.  clean up your code)
	Other warning fixes (unused variables, etc)
	Get rid of unused extension interfaces (aux screen procs)
	Make lots of functions in kdrive static
	Eliminate unused code from os library


--- NEW FILE: shmint.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: syncint.h ---
/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*

Copyright 1991, 1993, 1994, 1998  The Open Group

Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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.

*/

/***********************************************************
Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
and Olivetti Research Limited, Cambridge, England.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its 
documentation for any purpose and without fee is hereby granted, 
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in 
supporting documentation, and that the names of Digital or Olivetti
not be used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.  

DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
USE, 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.

******************************************************************/
/* $Id: syncint.h,v 1.1.2.1 2003/10/29 16:26:28 keithp Exp $ */

#ifndef _SYNCINT_H_
#define _SYNCINT_H_

#include <X11/extensions/syncstr.h>

#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */

typedef struct _SyncCounter {
    ClientPtr		client;	/* Owning client. 0 for system counters */
    XSyncCounter	id;		/* resource ID */
    CARD64		value;		/* counter value */
    struct _SyncTriggerList *pTriglist;	/* list of triggers */
    Bool		beingDestroyed; /* in process of going away */
    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
} SyncCounter;

/*
 * The System Counter interface
 */

typedef enum {
    XSyncCounterNeverChanges,
    XSyncCounterNeverIncreases,
    XSyncCounterNeverDecreases,
    XSyncCounterUnrestricted
} SyncCounterType;

typedef void
(*SyncQueryValueProcPtr) (pointer pCounter,
			  CARD64 *freshvalue);

typedef void
(*SyncBracketValuesProcPtr) (pointer pCounter,
			     CARD64 *lessthan,
			     CARD64 *greaterthan);

typedef struct _SysCounterInfo {
    char			*name;
    CARD64			resolution;
    CARD64			bracket_greater;
    CARD64			bracket_less;
    SyncCounterType		counterType;  /* how can this counter change */
    SyncQueryValueProcPtr	QueryValue;
    SyncBracketValuesProcPtr	BracketValues;
} SysCounterInfo;

struct _SyncTrigger;

typedef Bool
(*SyncCheckTriggerProcPtr) (struct _SyncTrigger *pTrigger,
			    CARD64		newval);

typedef void
(*SyncTriggerFiredProcPtr)(struct _SyncTrigger *pTrigger);

typedef void
(*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger);

typedef struct _SyncTrigger {
    SyncCounter			*pCounter;
    CARD64			wait_value;	/* wait value */
    unsigned int		value_type;     /* Absolute or Relative */
    unsigned int		test_type;	/* transition or Comparision type */
    CARD64			test_value;	/* trigger event threshold value */
    SyncCheckTriggerProcPtr	CheckTrigger;
    SyncTriggerFiredProcPtr	TriggerFired;
    SyncCounterDestroyedProcPtr	CounterDestroyed;
} SyncTrigger;

typedef struct _SyncTriggerList {
    SyncTrigger			*pTrigger;
    struct _SyncTriggerList	*next;
} SyncTriggerList;

typedef struct _SyncAlarmClientList {
    ClientPtr			client;
    XID				delete_id;
    struct _SyncAlarmClientList *next;
} SyncAlarmClientList;

typedef struct _SyncAlarm {
    SyncTrigger			trigger;
    ClientPtr			client;
    XSyncAlarm			alarm_id;
    CARD64			delta;
    int				events;
    int				state;
    SyncAlarmClientList		*pEventClients;
} SyncAlarm;

typedef struct {
    ClientPtr	client;
    CARD32 	delete_id;
    int		num_waitconditions;
} SyncAwaitHeader;

typedef struct {
    SyncTrigger trigger;
    CARD64	event_threshold;
    SyncAwaitHeader *pHeader;
} SyncAwait;

typedef union {
    SyncAwaitHeader header;
    SyncAwait	    await;
} SyncAwaitUnion;

pointer
SyncCreateSystemCounter(char			    *name,
			CARD64			    inital_value,
			CARD64			    resolution,
			SyncCounterType		    change_characterization,
			SyncQueryValueProcPtr	    QueryValue,
			SyncBracketValuesProcPtr    BracketValues);

void
SyncChangeCounter(SyncCounter	*pCounter,
		  CARD64	new_value);

void
SyncDestroySystemCounter(pointer pCounter);

void
InitServertime(void);

#endif /* _SYNCINT_H_ */

--- NEW FILE: xext.h ---
(This appears to be a binary file; contents omitted.)

Index: bigreq.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/bigreq.c,v
retrieving revision 3.7
retrieving revision 3.7.2.1
diff -u -d -r3.7 -r3.7.2.1
--- bigreq.c	11 Sep 2003 05:12:50 -0000	3.7
+++ bigreq.c	29 Oct 2003 16:26:28 -0000	3.7.2.1
@@ -39,6 +39,7 @@
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include <X11/extensions/bigreqstr.h>
+#include "xext.h"
 
 static unsigned char XBigReqCode;
 
@@ -51,7 +52,7 @@
 static DISPATCH_PROC(ProcBigReqDispatch);
 
 void
-BigReqExtensionInit()
+BigReqExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: mitmisc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/mitmisc.c,v
retrieving revision 3.6
retrieving revision 3.6.2.1
diff -u -d -r3.6 -r3.6.2.1
--- mitmisc.c	11 Sep 2003 05:12:50 -0000	3.6
+++ mitmisc.c	29 Oct 2003 16:26:28 -0000	3.6.2.1
@@ -41,6 +41,7 @@
 #include "extnsionst.h"
 #define _MITMISC_SERVER_
 #include <X11/extensions/mitmiscstr.h>
+#include "xext.h"
 
 extern Bool permitOldBugs;
 
@@ -60,7 +61,7 @@
 static DISPATCH_PROC(SProcMITSetBugMode);
 
 void
-MITMiscExtensionInit()
+MITMiscExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: saver.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/saver.c,v
retrieving revision 3.8
retrieving revision 3.8.2.1
diff -u -d -r3.8 -r3.8.2.1
--- saver.c	4 Oct 2003 02:43:16 -0000	3.8
+++ saver.c	29 Oct 2003 16:26:28 -0000	3.8.2.1
@@ -52,6 +52,7 @@
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
+#include "xext.h"
 
 
 #ifdef IN_MODULE
@@ -250,7 +251,7 @@
  ****************/
 
 void
-ScreenSaverExtensionInit()
+ScreenSaverExtensionInit(void)
 {
     ExtensionEntry *extEntry;
     int		    i;

Index: shm.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/shm.c,v
retrieving revision 3.40
retrieving revision 3.40.2.1
diff -u -d -r3.40 -r3.40.2.1
--- shm.c	12 Sep 2003 01:49:46 -0000	3.40
+++ shm.c	29 Oct 2003 16:26:28 -0000	3.40.2.1
@@ -62,6 +62,8 @@
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
+#include "xext.h"
+#include "shmint.h"
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
@@ -195,7 +197,7 @@
 #endif
     
 void
-ShmExtensionInit()
+ShmExtensionInit(void)
 {
     ExtensionEntry *extEntry;
     int i;
@@ -273,17 +275,13 @@
 }
 
 void
-ShmRegisterFuncs(pScreen, funcs)
-    ScreenPtr pScreen;
-    ShmFuncsPtr funcs;
+ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
 {
     shmFuncs[pScreen->myNum] = funcs;
 }
 
 void
-ShmSetPixmapFormat(pScreen, format)
-    ScreenPtr pScreen;
-    int format;
+ShmSetPixmapFormat(ScreenPtr pScreen, int format)
 {
     shmPixFormat[pScreen->myNum] = format;
 }

Index: sleepuntil.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sleepuntil.c,v
retrieving revision 3.7
retrieving revision 3.7.2.1
diff -u -d -r3.7 -r3.7.2.1
--- sleepuntil.c	11 Sep 2003 05:12:50 -0000	3.7
+++ sleepuntil.c	29 Oct 2003 16:26:28 -0000	3.7.2.1
@@ -89,11 +89,10 @@
 );
 
 int
-ClientSleepUntil (client, revive, notifyFunc, closure)
-    ClientPtr	client;
-    TimeStamp	*revive;
-    void	(*notifyFunc)();
-    pointer	closure;
+ClientSleepUntil (ClientPtr client, 
+		  TimeStamp *revive,
+		  void	    (*notifyFunc) (ClientPtr client, pointer closure),
+		  pointer   closure)
 {
     SertafiedPtr	pRequest, pReq, pPrev;
 

Index: sleepuntil.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sleepuntil.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- sleepuntil.h	11 Sep 2003 05:12:50 -0000	1.2
+++ sleepuntil.h	29 Oct 2003 16:26:28 -0000	1.2.2.1
@@ -30,18 +30,10 @@
 
 #include "dix.h"
 
-extern int ClientSleepUntil(
-#if NeedFunctionPrototypes
-    ClientPtr client,
-    TimeStamp *revive,
-    void (*notifyFunc)(
-#if NeedNestedPrototypes
-	ClientPtr /* client */,
-	pointer   /* closure */
-#endif
-	),
-    pointer Closure
-#endif
-);
+int
+ClientSleepUntil (ClientPtr client, 
+		  TimeStamp *revive,
+		  void	    (*notifyFunc) (ClientPtr client, pointer closure),
+		  pointer   closure);
 
 #endif

Index: sync.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sync.c,v
retrieving revision 3.13
retrieving revision 3.13.2.1
diff -u -d -r3.13 -r3.13.2.1
--- sync.c	11 Sep 2003 05:12:50 -0000	3.13
+++ sync.c	29 Oct 2003 16:26:28 -0000	3.13.2.1
@@ -69,6 +69,8 @@
 #define _SYNC_SERVER
 #include <X11/extensions/sync.h>
 #include <X11/extensions/syncstr.h>
+#include "syncint.h"
+#include "xext.h"
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
@@ -1094,15 +1096,13 @@
  * ***** System Counter utilities
  */
 
-pointer 
-SyncCreateSystemCounter(name, initial, resolution, counterType,
-			QueryValue, BracketValues)
-    char           *name;
-    CARD64          initial;
-    CARD64          resolution;
-    SyncCounterType counterType;
-    void            (*QueryValue) ();
-    void            (*BracketValues) ();
+pointer
+SyncCreateSystemCounter(char			    *name,
+			CARD64			    initial,
+			CARD64			    resolution,
+			SyncCounterType		    counterType,
+			SyncQueryValueProcPtr	    QueryValue,
+			SyncBracketValuesProcPtr    BracketValues)
 {
     SyncCounter    *pCounter;
 
@@ -2402,7 +2402,7 @@
  * ** Initialise the extension.
  */
 void 
-SyncExtensionInit()
+SyncExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: xcmisc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xcmisc.c,v
retrieving revision 3.8
retrieving revision 3.8.2.1
diff -u -d -r3.8 -r3.8.2.1
--- xcmisc.c	12 Sep 2003 01:49:46 -0000	3.8
+++ xcmisc.c	29 Oct 2003 16:26:28 -0000	3.8.2.1
@@ -41,6 +41,7 @@
 #include "extnsionst.h"
 #include "swaprep.h"
 #include <X11/extensions/xcmiscstr.h>
+#include "xext.h"
 
 static unsigned char XCMiscCode;
 
@@ -60,7 +61,7 @@
 static DISPATCH_PROC(SProcXCMiscGetXIDRange);
 
 void
-XCMiscExtensionInit()
+XCMiscExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: xres.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xres.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- xres.c	30 Sep 2003 06:02:41 -0000	1.8
+++ xres.c	29 Oct 2003 16:26:28 -0000	1.8.2.1
@@ -17,6 +17,7 @@
 #include "swaprep.h"
 #include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
+#include "xext.h"
 
 extern RESTYPE lastResourceType;
 extern RESTYPE TypeMask;

Index: xtest.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest.c,v
retrieving revision 3.9
retrieving revision 3.9.2.1
diff -u -d -r3.9 -r3.9.2.1
--- xtest.c	11 Sep 2003 05:12:50 -0000	3.9
+++ xtest.c	29 Oct 2003 16:26:28 -0000	3.9.2.1
@@ -55,6 +55,7 @@
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
+#include "xext.h"
 
 static unsigned char XTestReqCode;
 
@@ -86,7 +87,7 @@
 static DISPATCH_PROC(SProcXTestGrabControl);
 
 void
-XTestExtensionInit()
+XTestExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 

Index: xtest1di.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest1di.c,v
retrieving revision 3.5
retrieving revision 3.5.2.1
diff -u -d -r3.5 -r3.5.2.1
--- xtest1di.c	11 Sep 2003 05:12:50 -0000	3.5
+++ xtest1di.c	29 Oct 2003 16:26:28 -0000	3.5.2.1
@@ -77,6 +77,7 @@
 #include <X11/extensions/xtestext1.h>
 
 #include "xtest1dd.h"
+#include "xext.h"
 
 /*****************************************************************************
  * defines
@@ -189,7 +190,7 @@
  *	(other than the core errors).
  */
 void
-XTestExtension1Init()
+XTestExtension1Init(void)
 {
 	/*
 	 * holds the pointer to the extension entry structure

Index: xvmc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xvmc.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- xvmc.c	12 Sep 2003 01:49:46 -0000	1.10
+++ xvmc.c	29 Oct 2003 16:26:28 -0000	1.10.2.1
@@ -644,7 +644,8 @@
    return Success;
 }
 
-XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
+XvImagePtr
+XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
 {
     XvImagePtr pImage = NULL;
     ScreenPtr pScreen = pPort->pAdaptor->pScreen;

Index: xvmcext.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xvmcext.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- xvmcext.h	12 Sep 2003 01:49:46 -0000	1.3
+++ xvmcext.h	29 Oct 2003 16:26:28 -0000	1.3.2.1
@@ -106,4 +106,7 @@
 
 int XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr adapt);
 
+XvImagePtr
+XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
+
 #endif /* _XVMC_H */