Remove remnants of support for SysV versions before SVR4

Most of the support for such OS'es was removed in 2010 for
xorg-server-1.10.0, but a few bits lingered on, and a few
comments were left out-of-date.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1667>

8 files changed, 12 insertions, 17 deletions

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 71e0a0a96..073a81bf3 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -798,7 +798,7 @@ OsVendorInit(void)
 /*
  * ddxGiveUp --
  *      Device dependent cleanup. Called by by dix before normal server death.
- *      For SYSV386 we must switch the terminal back to normal mode. No error-
+ *      On some OSes we must switch the terminal back to normal mode. No error-
  *      checking here, since there should be restored as much as possible.
  */
 
diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c
index ed06d944a..f0e54ee5e 100644
--- a/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -34,8 +34,7 @@
 #include "xf86_OSlib.h"
 
 /*
- * Handle the VT-switching interface for OSs that use USL-style ioctl()s
- * (the bsd, sysv, sco, and linux subdirs).
+ * Handle the VT-switching interface for BSD OSs that use USL-style ioctl()s.
  */
 
 /*
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index a905cce24..ca083fcfd 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -36,7 +36,8 @@
 
 /*
  * Handle the VT-switching interface for OSs that use USL-style ioctl()s
- * (the sysv, sco, and linux subdirs).
+ * (this used to include the sysv, sco, and linux subdirs, but only linux
+ *  remains now).
  */
 
 /*
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 11d3f1244..c706f260b 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -81,9 +81,9 @@
 #include <stddef.h>
 
 /**************************************************************************/
-/* SYSV386 (SVR3, SVR4), including Solaris                                */
+/* SVR4, including Solaris                                                */
 /**************************************************************************/
-#if (defined(SYSV) || defined(SVR4)) && \
+#if (defined(SVR4)) && \
     (defined(__sun) || defined(__i386__))
 #include <sys/ioctl.h>
 #include <signal.h>
@@ -110,14 +110,12 @@
 #define VT_ACKACQ 2
 #endif                          /* !VT_ACKACQ */
 
-#if defined(SVR4)
 #if !(defined(__sun) && defined (SVR4))
 #define DEV_MEM "/dev/pmem"
 #endif
 #define CLEARDTR_SUPPORT
-#endif                          /* SVR4 */
 
-#endif                          /* (SYSV || SVR4) */
+#endif                          /* SVR4 */
 
 /**************************************************************************/
 /* Linux or Glibc-based system                                            */
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 39392082d..a507b0e2f 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -25,7 +25,7 @@
 
 #include <xwayland-config.h>
 
-#if !defined(SYSV) && !defined(WIN32)
+#if !defined(WIN32)
 #include <sys/resource.h>
 #endif
 
diff --git a/os/access.c b/os/access.c
index 8eadb3eda..cbc4e96fd 100644
--- a/os/access.c
+++ b/os/access.c
@@ -124,12 +124,9 @@ SOFTWARE.
 #include <sys/un.h>
 #endif
 
-#if defined(SVR4) ||  (defined(SYSV) && defined(__i386__)) || defined(__GNU__)
+#if defined(SVR4) || defined(__GNU__)
 #include <sys/utsname.h>
 #endif
-#if defined(SYSV) &&  defined(__i386__)
-#include <sys/stream.h>
-#endif
 #ifdef __GNU__
 #undef SIOCGIFCONF
 #include <netdb.h>
diff --git a/os/osinit.c b/os/osinit.c
index 9a4a5ee7e..d376be780 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -71,7 +71,7 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "dixstruct_priv.h"
 
-#if !defined(SYSV) && !defined(WIN32)
+#if !defined(WIN32)
 #include <sys/resource.h>
 #endif
 
@@ -254,7 +254,7 @@ OsInit(void)
                 dup2(fileno(err), 2);
                 fclose(err);
             }
-#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__)
+#if defined(SVR4) || defined(WIN32) || defined(__CYGWIN__)
             {
                 static char buf[BUFSIZ];
 
diff --git a/os/utils.c b/os/utils.c
index 6879e334d..ac18110cf 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -91,7 +91,7 @@ __stdcall unsigned long GetTickCount(void);
 #ifndef WIN32
 #include <sys/wait.h>
 #endif
-#if !defined(SYSV) && !defined(WIN32)
+#if !defined(WIN32)
 #include <sys/resource.h>
 #endif
 #include <sys/stat.h>