diff options
| author | Kevin E Martin <kem@redhat.com> | 2004-08-26 05:10:56 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@redhat.com> | 2004-08-26 05:10:56 +0000 |
| commit | 15c61546ea1a64d6c7dd60764164143ea7174123 (patch) | |
| tree | ac21e6a4f13c8ddd6d8f49bf6fe5d7e7fec852cb /src/i830_video.c | |
| parent | 828c0fb8050dcbed8026365cbcb17d4d4330c268 (diff) | |
Fix i810 compilation without Xinerama (Bug #1180, Simon Schubert).XORG-6_7_99_903
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 31be8a64..794aecfc 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -1449,9 +1449,12 @@ I830PutImage(ScrnInfoPtr pScrn, if (pI830->entityPrivate) { if (pI830->entityPrivate->XvInUse != -1 && pI830->entityPrivate->XvInUse != pI830->pipe) { +#ifdef PANORAMIX if (!noPanoramiXExtension) { return Success; /* faked for trying to share it */ - } else { + } else +#endif + { return BadAlloc; } } @@ -1834,9 +1837,12 @@ I830DisplaySurface(XF86SurfacePtr surface, if (pI830->entityPrivate) { if (pI830->entityPrivate->XvInUse != -1 && pI830->entityPrivate->XvInUse != pI830->pipe) { +#ifdef PANORAMIX if (!noPanoramiXExtension) { return Success; /* faked for trying to share it */ - } else { + } else +#endif + { return BadAlloc; } } |