summaryrefslogtreecommitdiffstats
path: root/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/werror-address-fix.patch
blob: 49d3f947bfc19e44a9c2e54975804ce7a8d57d60 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
Upstream-Status: Inappropriate [yocto-specific]

This is fixed upstream by actually making these tests meaningful.
As they stand, the warning is correct and they're no-ops, so remove
them.

Signed-off-by: Tom Zanussi <tom.zanussi (a] intel.com>

Index: xorg-server-1.9.3/Xext/xvmc.c
===================================================================
--- xorg-server-1.9.3.orig/Xext/xvmc.c	2012-01-12 09:57:36.306947860 -0600
+++ xorg-server-1.9.3/Xext/xvmc.c	2012-01-12 10:24:59.286729946 -0600
@@ -467,7 +467,6 @@
     return Success;
 }
 
-
 static int
 ProcXvMCListSubpictureTypes(ClientPtr client)
 {
@@ -487,9 +486,6 @@
 
     pScreen = pPort->pAdaptor->pScreen;
 
-    if(XvMCScreenKey == NULL) /* No XvMC adaptors */
-        return BadMatch;
-
     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))
         return BadMatch;   /* None this screen */
 
@@ -668,9 +664,6 @@
 {
    ExtensionEntry *extEntry;
 
-   if(XvMCScreenKey == NULL) /* nobody supports it */
-	return; 
-
    if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes,
 					      "XvMCRTContext")))
 	return;
@@ -746,8 +739,6 @@
     XvMCAdaptorPtr adaptor = NULL;
     int i;
 
-    if(XvMCScreenKey == NULL) return NULL;
-
     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) 
         return NULL;