xf86-video-nv: src/riva_xaa.c

[GitLab Mirror]

 src/riva_xaa.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 94d6ea61377220d937eb5da9ef99e95fc6356b90
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 25 19:13:06 2022 -0700

    riva_xaa: don't build RivaSetRopPattern when XAA is not supported
    
    Fixes gcc warnings:
    
    riva_xaa.c: In function ‘RivaSetRopPattern’:
    riva_xaa.c:94:33: warning: implicit declaration of function
      ‘XAAGetPatternROP’; did you mean ‘RivaSetPattern’?
      [-Wimplicit-function-declaration]
             pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
                                     ^~~~~~~~~~~~~~~~
                                     RivaSetPattern
    At top level:
    riva_xaa.c:89:1: warning: ‘RivaSetRopPattern’ defined but not used
      [-Wunused-function]
     RivaSetRopPattern(RivaPtr pRiva, int rop)
     ^~~~~~~~~~~~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/riva_xaa.c b/src/riva_xaa.c
index 3139d07..8d3d15f 100644
--- a/src/riva_xaa.c
+++ b/src/riva_xaa.c
@@ -85,6 +85,7 @@ RivaSetRopSolid(RivaPtr pRiva, int rop)
     }
 }
 
+#ifdef HAVE_XAA_H
 static void
 RivaSetRopPattern(RivaPtr pRiva, int rop)
 {
@@ -94,7 +95,7 @@ RivaSetRopPattern(RivaPtr pRiva, int rop)
         pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
     }
 }
-#ifdef HAVE_XAA_H
+
 /*
  * Fill solid rectangles.
  */