Attachment 724 Details for Bug 1180 – fix compilation without Xinerama

[patch] fix compilation without Xinerama

nopanoramix.diff (text/plain), 983 bytes, created by Simon 'corecode' Schubert on 2004-08-25 02:53:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon 'corecode' Schubert

Created: 2004-08-25 02:53:28 UTC

Size: 983 bytes

patch

obsolete

>? nopanoramix.diff
>Index: i830_video.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v
>retrieving revision 1.3
>diff -u -r1.3 i830_video.c
>--- i830_video.c	22 Jun 2004 14:28:46 -0000	1.3
>+++ i830_video.c	25 Aug 2004 09:48:51 -0000
>@@ -1449,9 +1449,12 @@
>    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 @@
>    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;
> 		}
> 	 }

Actions: View | Splinter Review

Attachments on bug 1180: 724

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.