From 2aee8e8d4bb740dccf3f3c33f7ef161f9e1a835d Mon Sep 17 00:00:00 2001
From: Mikael Asplund <mikael.asplund@liu.se>
Date: Fri, 6 Mar 2020 15:24:04 +0100
Subject: Changed compiler version and took away stream code which relies on a
 header file no longer present in Linux

---
 src/Make.config         |  4 ++--
 src/utils/squish-pty.c  | 10 ----------
 src/utils/squish-unix.c |  1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/Make.config b/src/Make.config
index 1301180..f5c6705 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -11,12 +11,12 @@ VPATH = $(SRCDIR)
 X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*\|i86pc
 X86_64 = x86_64
 ifneq (0, $(shell expr `uname -m` : '$(X86)'))
-  CC = gcc-4.8
+  CC = gcc
   LD = ld
   OBJCOPY = objcopy
 else
   ifneq (0, $(shell expr `uname -m` : '$(X86_64)'))
-    CC = gcc-4.8 -m32
+    CC = gcc -m32
     LD = ld -melf_i386
     OBJCOPY = objcopy
   else
diff --git a/src/utils/squish-pty.c b/src/utils/squish-pty.c
index c8375a5..ea060c7 100644
--- a/src/utils/squish-pty.c
+++ b/src/utils/squish-pty.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stropts.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -287,15 +286,6 @@ main (int argc __attribute__ ((unused)), char *argv[])
   if (slave < 0)
     fail_io ("open \"%s\"", name);
 
-  /* System V implementations need STREAMS configuration for the
-     slave. */
-  if (isastream (slave))
-    {
-      if (ioctl (slave, I_PUSH, "ptem") < 0
-          || ioctl (slave, I_PUSH, "ldterm") < 0)
-        fail_io ("ioctl");
-    }
-
   /* Arrange to get notified when a child dies, by writing a byte
      to a pipe fd.  We really want to use pselect() and
      sigprocmask(), but Solaris 2.7 doesn't have it. */
diff --git a/src/utils/squish-unix.c b/src/utils/squish-unix.c
index 9d9aa42..c594fde 100644
--- a/src/utils/squish-unix.c
+++ b/src/utils/squish-unix.c
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stropts.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-- 
cgit v1.2.1