From 7a0c33622b460c94beef6cd31ef37807887f5a2c Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 1 Apr 2008 06:18:46 +0000
Subject: 	* lib/openpty.c: Remove conditional inclusion of <stropts.h> 
 * hyper/spadbuf.c: Remove conditional inclusion of <bstring.h> 	*
 sman/session.c: Likewise. 	* hyper/halloc.c: Remove conditional inclusion
 of <malloc.h>

---
 src/ChangeLog               | 7 +++++++
 src/clef/edible.c           | 5 -----
 src/graph/viewman/cleanup.c | 3 ---
 src/graph/viewman/viewman.c | 4 ----
 src/hyper/event.c           | 4 ----
 src/hyper/halloc.c          | 3 ---
 src/hyper/spadbuf.c         | 4 ----
 src/lib/openpty.c           | 5 -----
 src/sman/session.c          | 4 ----
 9 files changed, 7 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e2c7153..295fb21c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* lib/openpty.c: Remove conditional inclusion of <stropts.h>
+	* hyper/spadbuf.c: Remove conditional inclusion of <bstring.h>
+	* sman/session.c: Likewise.
+	* hyper/halloc.c: Remove conditional inclusion of <malloc.h>
+
 2008-03-31  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* interp/sys-utility.boot (loadModule): New.
diff --git a/src/clef/edible.c b/src/clef/edible.c
index 29a1b2fe..c46634da 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -47,11 +47,6 @@
 #include <signal.h>
 
 
-#if defined (SGIplatform)
-#include <bstring.h>
-#endif
-
-
 #include "axiom-c-macros.h"
 #include "sockio.h"
 #include "edible.h"
diff --git a/src/graph/viewman/cleanup.c b/src/graph/viewman/cleanup.c
index 73cb0a94..6d42d963 100644
--- a/src/graph/viewman/cleanup.c
+++ b/src/graph/viewman/cleanup.c
@@ -39,9 +39,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#if !defined(BSDplatform)
-#include <malloc.h>
-#endif
 #include <assert.h>
 #include <signal.h>
 #include <sys/wait.h>
diff --git a/src/graph/viewman/viewman.c b/src/graph/viewman/viewman.c
index 441d0f7a..aaacef25 100644
--- a/src/graph/viewman/viewman.c
+++ b/src/graph/viewman/viewman.c
@@ -42,10 +42,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
-#ifdef SGIplatform
-#include <bstring.h>
-#endif
-
 #include "viewman.h"
 #include "mode.h"
 #include "actions.h"
diff --git a/src/hyper/event.c b/src/hyper/event.c
index 1813576e..79ca1a44 100644
--- a/src/hyper/event.c
+++ b/src/hyper/event.c
@@ -49,10 +49,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#ifdef SGIplatform
-#include <bstring.h>
-#endif
-
 #include "event.h"
 #include "keyin.h"
 #include "hyper.h"
diff --git a/src/hyper/halloc.c b/src/hyper/halloc.c
index acdfb87e..0f66b292 100644
--- a/src/hyper/halloc.c
+++ b/src/hyper/halloc.c
@@ -39,9 +39,6 @@
 #include "debug.h"
 #include <stdio.h>
 #include <stdlib.h>
-#if !defined(BSDplatform)
-#include <malloc.h>
-#endif
 
 FILE *fp;
 
diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c
index f67c1519..1a6bc0ef 100644
--- a/src/hyper/spadbuf.c
+++ b/src/hyper/spadbuf.c
@@ -47,10 +47,6 @@
 #include <sys/time.h>
 #include <signal.h>
 
-#ifdef SGIplatform
-#include <bstring.h>
-#endif
-
 #include "bsdsignal.h"
 #include "sockio.h"
 #include "edible.h"
diff --git a/src/lib/openpty.c b/src/lib/openpty.c
index 5b99f2ad..68e6edc9 100644
--- a/src/lib/openpty.c
+++ b/src/lib/openpty.c
@@ -38,11 +38,6 @@
 #include <fcntl.h>
 #include <string.h>
 
-#if defined(SUN4OS5platform) || defined(HP10platform)
-#include <stropts.h>
-#endif
-
-
 #include "openpty.H1"
 
 
diff --git a/src/sman/session.c b/src/sman/session.c
index 73868a19..442da39d 100644
--- a/src/sman/session.c
+++ b/src/sman/session.c
@@ -43,10 +43,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
-#ifdef SGIplatform
-#include <bstring.h>
-#endif
-
 #include "sockio.h"
 #include "com.h"
 #include "bsdsignal.h"
-- 
cgit v1.2.3