xserver: Branch 'master'

[GitLab Mirror]

 os/connection.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 584a9715c3db786908e98ee6a0180266181f4287
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 17 16:31:46 2024 -0800

    unifdef apollo
    
    Apollo Domain/OS died in the 1990's and has never been supported in
    the modular Xserver builds.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/os/connection.c b/os/connection.c
index a3c8f2a99..8d4b66061 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -87,16 +87,10 @@ SOFTWARE.
 #if defined(TCPCONN)
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifdef apollo
-#ifndef NO_TCP_H
-#include <netinet/tcp.h>
-#endif
-#else
 #ifdef CSRG_BASED
 #include <sys/param.h>
 #endif
 #include <netinet/tcp.h>
-#endif
 #include <arpa/inet.h>
 #endif