xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Priv.h |    1 -
 include/os.h                 |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit a56da0ff2814f86af08668610327082b8e2f4308
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Sep 12 17:19:38 2018 -0400

    include: Remove now-dead declarations
    
    60ec8ead broke the autotools build:
    
        sdksyms.o:(.data+0x58): undefined reference to `InitConnectionLimits'
        sdksyms.o:(.data+0x2ec8): undefined reference to `xf86ServerName'
        collect2: error: ld returned 1 exit status
        Makefile:811: recipe for target 'Xorg' failed
    
    Likewise 3a4d7c79 for InitConnectionLimits.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 393af3900..b425bfb69 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -70,7 +70,6 @@ extern _X_EXPORT int xf86Depth;
 extern _X_EXPORT rgb xf86Weight;
 extern _X_EXPORT Bool xf86FlipPixels;
 extern _X_EXPORT Gamma xf86Gamma;
-extern _X_EXPORT const char *xf86ServerName;
 
 /* Other parameters */
 
diff --git a/include/os.h b/include/os.h
index 3646194a0..947f3c2af 100644
--- a/include/os.h
+++ b/include/os.h
@@ -127,8 +127,6 @@ extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
 
 extern _X_EXPORT void ResetOsBuffers(void);
 
-extern _X_EXPORT void InitConnectionLimits(void);
-
 extern _X_EXPORT void NotifyParentProcess(void);
 
 extern _X_EXPORT void CreateWellKnownSockets(void);