frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2012-07-12 08:26:35 -07:00
parent 8b820f221a 1720cd9bad
commit 656e5fea6c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/pseudoramiX.c
View File

@ -126,7 +126,7 @@ PseudoramiXAddScreen(int x, int y, int w, int h)
// Initialize PseudoramiX. // Initialize PseudoramiX.
// Copied from PanoramiXExtensionInit // Copied from PanoramiXExtensionInit
void void
PseudoramiXExtensionInit(int argc, char *argv[]) PseudoramiXExtensionInit(void)
{ {
Bool success = FALSE; Bool success = FALSE;
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -257,7 +257,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
REQUEST(xPanoramiXGetScreenSizeReq); REQUEST(xPanoramiXGetScreenSizeReq);
WindowPtr pWin; WindowPtr pWin;
xPanoramiXGetScreenSizeReply rep; xPanoramiXGetScreenSizeReply rep;
register int n, rc; register int rc;
TRACE(); TRACE();

3
hw/xquartz/xpr/dri.h
View File

@ -72,6 +72,9 @@ DRIFinishScreenInit(ScreenPtr pScreen);
extern void extern void
DRICloseScreen(ScreenPtr pScreen); DRICloseScreen(ScreenPtr pScreen);
extern Bool
DRIExtensionInit(void);
extern void extern void
DRIReset(void); DRIReset(void);