diff options
| author | Mikael Asplund <mikael.asplund@liu.se> | 2020-03-06 15:24:04 +0100 |
|---|---|---|
| committer | Mikael Asplund <mikael.asplund@liu.se> | 2020-03-06 15:24:04 +0100 |
| commit | 2aee8e8d4bb740dccf3f3c33f7ef161f9e1a835d (patch) | |
| tree | e7fded7bbf1131d10525f5ec44bf2e44b3d4cfb7 | |
| parent | f3156831364fb2d3bec8c2f7ba7e8c10e91be13e (diff) | |
| download | pintos-2aee8e8d4bb740dccf3f3c33f7ef161f9e1a835d.tar.gz | |
Changed compiler version and took away stream code which relies on a header file no longer present in Linux
| -rw-r--r-- | src/Make.config | 4 | ||||
| -rw-r--r-- | src/utils/squish-pty.c | 10 | ||||
| -rw-r--r-- | src/utils/squish-unix.c | 1 |
3 files changed, 2 insertions, 13 deletions
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> |