xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/int10/generic.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a2e7904b1df9ceef21f7fe9473d99eff46f12ca6
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 5 20:34:28 2024 +0100

    fix: unused readIntVec()
    
    [585/699] Compiling C object hw/xfree86/int10/libint10.so.p/generic.c.o
    ../hw/xfree86/int10/generic.c:103:1: warning: ‘readIntVec’ defined but not used [-Wunused-function]
      103 | readIntVec(struct pci_device *dev, unsigned char *buf, int len)
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>

diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 191571192..850663b73 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -92,12 +92,11 @@ int10MemRec genericMem = {
 static void MapVRam(xf86Int10InfoPtr pInt);
 static void UnmapVRam(xf86Int10InfoPtr pInt);
 
+static void *sysMem = NULL;
+
 #ifdef _PC
 #define GET_HIGH_BASE(x) (((V_BIOS + (x) + getpagesize() - 1)/getpagesize()) \
                               * getpagesize())
-#endif
-
-static void *sysMem = NULL;
 
 static Bool
 readIntVec(struct pci_device *dev, unsigned char *buf, int len)
@@ -112,6 +111,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
 
     return TRUE;
 }
+#endif /* _PC */
 
 xf86Int10InfoPtr
 xf86ExtendedInitInt10(int entityIndex, int Flags)