diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-12 08:26:35 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-12 08:26:35 -0700 |
| commit | 656e5fea6c9ca15f932889edcc590dd01c881945 (patch) | |
| tree | 31248948135a6ec0bc97c5878c219378721e0121 | |
| parent | 8b820f221ad54eb96a16c7060048abc8824371b6 (diff) | |
| parent | 1720cd9badf21e5d6b2c6c929e609ab3b0b92fd2 (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
| -rw-r--r-- | hw/xquartz/pseudoramiX.c | 4 | ||||
| -rw-r--r-- | hw/xquartz/xpr/dri.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c index 3e1050047..c650dd723 100644 --- a/hw/xquartz/pseudoramiX.c +++ b/hw/xquartz/pseudoramiX.c @@ -126,7 +126,7 @@ PseudoramiXAddScreen(int x, int y, int w, int h) // Initialize PseudoramiX. // Copied from PanoramiXExtensionInit void -PseudoramiXExtensionInit(int argc, char *argv[]) +PseudoramiXExtensionInit(void) { Bool success = FALSE; ExtensionEntry *extEntry; @@ -257,7 +257,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client) REQUEST(xPanoramiXGetScreenSizeReq); WindowPtr pWin; xPanoramiXGetScreenSizeReply rep; - register int n, rc; + register int rc; TRACE(); diff --git a/hw/xquartz/xpr/dri.h b/hw/xquartz/xpr/dri.h index 7d1c4f212..8717a5186 100644 --- a/hw/xquartz/xpr/dri.h +++ b/hw/xquartz/xpr/dri.h @@ -72,6 +72,9 @@ DRIFinishScreenInit(ScreenPtr pScreen); extern void DRICloseScreen(ScreenPtr pScreen); +extern Bool +DRIExtensionInit(void); + extern void DRIReset(void); |