xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/kdrive/src/kdrive.c                  |    2 ++
 hw/xfree86/common/xf86Xinput.c          |    2 +-
 hw/xfree86/os-support/bsd/bsd_init.c    |    2 +-
 hw/xfree86/os-support/hurd/hurd_init.c  |    2 +-
 hw/xfree86/os-support/linux/lnx_init.c  |    2 +-
 hw/xfree86/os-support/solaris/sun_vid.c |    2 +-
 hw/xfree86/os-support/stub/stub_init.c  |    2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 2764128e9fe775fabe28b0b9be427c16754e7128
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Apr 17 11:43:57 2019 +0100

    Fix missing prototype warning for xf86_find_platform_device_by_devnum()
    
    ../hw/kdrive/src/kdrive.c:999:1: warning: no previous prototype for ‘xf86_find_platform_device_by_devnum’ [-Wmissing-prototypes]
    
    Place the same guards around this stub as are around including the
    hotplug.h header which declares the prototype.

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 77114dc46..78a8f77d7 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -995,11 +995,13 @@ DeleteGPUDeviceRequest(struct OdevAttributes *attribs)
 }
 #endif
 
+#if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
 struct xf86_platform_device *
 xf86_find_platform_device_by_devnum(int major, int minor)
 {
     return NULL;
 }
+#endif
 
 #ifdef SYSTEMD_LOGIND
 void
commit ba59427abae3a8b260e66fcfab90c9de96c3e01c
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Apr 17 11:37:56 2019 +0100

    Fix maybe-uninitialized warning in xf86NewInputDevice()
    
    If SYSTEMD_LOGIND is not defined, systemd_logind_take_fd is defined as a
    macro evaluating to -1 by systemd-logind.h, leaving paused
    uninitialized.
    
    ../hw/xfree86/common/xf86Xinput.c: In function ‘xf86NewInputDevice’:
    ../hw/xfree86/common/xf86Xinput.c:919:16: warning: ‘paused’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    ../hw/xfree86/common/xf86Xinput.c:877:10: note: ‘paused’ was declared here

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 75235b368..07e52bcf7 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -874,7 +874,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
 {
     InputDriverPtr drv = NULL;
     DeviceIntPtr dev = NULL;
-    Bool paused;
+    Bool paused = FALSE;
     int rval;
     char *path = NULL;
 
commit 7c266cafed14b38c039091651069ae9888c3a8ae
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Apr 17 11:37:11 2019 +0100

    Fix old-style definition warning for xf86OSInputThreadInit()
    
    ../hw/xfree86/os-support/stub/stub_init.c: In function ‘xf86OSInputThreadInit’:
    ../hw/xfree86/os-support/stub/stub_init.c:29:1: warning: old-style function definition [-Wold-style-definition]

diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 2cd2b57c7..6fdf6d4e6 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -663,7 +663,7 @@ xf86UseMsg()
 }
 
 void
-xf86OSInputThreadInit()
+xf86OSInputThreadInit(void)
 {
     return;
 }
diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c
index ee8fe92c0..c1b632f19 100644
--- a/hw/xfree86/os-support/hurd/hurd_init.c
+++ b/hw/xfree86/os-support/hurd/hurd_init.c
@@ -89,7 +89,7 @@ xf86CloseConsole()
 }
 
 void
-xf86OSInputThreadInit()
+xf86OSInputThreadInit(void)
 {
     return;
 }
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 9ef6a39b5..111b3b4e4 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -409,7 +409,7 @@ xf86UseMsg(void)
 }
 
 void
-xf86OSInputThreadInit()
+xf86OSInputThreadInit(void)
 {
     return;
 }
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index edb0a1172..2b48e66b0 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -74,7 +74,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 /***************************************************************************/
 
 void
-xf86OSInputThreadInit()
+xf86OSInputThreadInit(void)
 {
     /*
      * Need to enable in input thread as well, as Solaris kernel tracks
diff --git a/hw/xfree86/os-support/stub/stub_init.c b/hw/xfree86/os-support/stub/stub_init.c
index 1285ec482..f0d9039b9 100644
--- a/hw/xfree86/os-support/stub/stub_init.c
+++ b/hw/xfree86/os-support/stub/stub_init.c
@@ -26,7 +26,7 @@ xf86UseMsg(void)
 }
 
 void
-xf86OSInputThreadInit()
+xf86OSInputThreadInit(void)
 {
     return;
 }