Removed malloc.h since it's obsolete, fixed follow.c to not use tty_read_fd

since it looks like a copy-paste job that didn't get fixed and causes
brokenness on bsd

5 files changed, 1 insertions, 6 deletions

diff --git a/cmd2.c b/cmd2.c
index 004789f..8e6a110 100644
--- a/cmd2.c
+++ b/cmd2.c
@@ -26,7 +26,6 @@
 #include <errno.h>
 
 #ifdef USE_REGEXP
-# include "malloc.h"
 # include <regex.h>
 #endif
 
diff --git a/defines.h b/defines.h
index 88f24d2..79b15e7 100644
--- a/defines.h
+++ b/defines.h
@@ -5,8 +5,6 @@
 #ifndef _DEFINES_H_
 #define _DEFINES_H_
 
-#include "malloc.h"
-
 #if !defined(SYS_TIME_H) && !defined(_H_SYS_TIME)
 #  include <sys/time.h>
 #endif
diff --git a/follow.c b/follow.c
index fe75558..4dba062 100644
--- a/follow.c
+++ b/follow.c
@@ -96,7 +96,7 @@ void set_terminal()
     ioctl(0, TIOCGLTC, &ltcsave);
     ttyb = ttybsave;
     ttyb.sg_flags = (ttyb.sg_flags|O_CBREAK) & ~O_ECHO;
-    ioctl(tty_read_fd, TIOCSETP, &ttyb);
+    ioctl(0, TIOCSETP, &ttyb);
     ltc = ltcsave;
     ltc.t_suspc = -1;
     ioctl(0, TIOCSLTC, &ltc);
diff --git a/list.c b/list.c
index df0bfc4..8bab96f 100644
--- a/list.c
+++ b/list.c
@@ -19,7 +19,6 @@
 #include <sys/time.h>
 
 #ifdef USE_REGEXP
-# include "malloc.h"
 # include <regex.h>
 #endif
 
diff --git a/main.c b/main.c
index 3575dec..4e392e9 100644
--- a/main.c
+++ b/main.c
@@ -76,7 +76,6 @@ extern int errno;
 extern int select();
 
 #ifdef USE_REGEXP
-# include "malloc.h"
 # include <regex.h>
 #endif