xserver: Branch 'server-1.20-branch' - 2 commits

[GitLab Mirror]

 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  |    6 ++++++
 5 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 8837279869309317c110afb6f2f3c24484c77657
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]
    
    (cherry picked from commit 7c266cafed14b38c039091651069ae9888c3a8ae)

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 5c0367c6f..011d8da4f 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -399,7 +399,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;
 }
commit 0c012f968b4e02a2bc892ce71f7bea9bd3f7fb22
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Mar 13 14:57:14 2019 +0000

    Add xf86OSInputThreadInit to stub os-support as well
    
    stub os support also needs to provide xf86OSInputThreadInit, omitted in
    ea1527a8
    
    (cherry picked from commit c020769dbfb965740c8441d8242b738ef572a7c9)

diff --git a/hw/xfree86/os-support/stub/stub_init.c b/hw/xfree86/os-support/stub/stub_init.c
index d3e0c3f29..1285ec482 100644
--- a/hw/xfree86/os-support/stub/stub_init.c
+++ b/hw/xfree86/os-support/stub/stub_init.c
@@ -24,3 +24,9 @@ void
 xf86UseMsg(void)
 {
 }
+
+void
+xf86OSInputThreadInit()
+{
+    return;
+}