From 9a361d19830a05745fa99defd542e62a1f492135 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 29 Oct 2002 09:47:24 +0000
Subject: [PATCH] Eliminated dependency on __BSD macro.

---
 xtrn/sbl/smb2sbl.c  | 2 +-
 xtrn/sdk/xsdk.h     | 2 +-
 xtrn/sdk/xsdkinet.h | 2 --
 xtrn/sdk/xsdkwrap.c | 6 ++----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/xtrn/sbl/smb2sbl.c b/xtrn/sbl/smb2sbl.c
index 0c0809a839..22a68f94b1 100644
--- a/xtrn/sbl/smb2sbl.c
+++ b/xtrn/sbl/smb2sbl.c
@@ -45,7 +45,7 @@
 #include <sys/stat.h>	/* S_IWRITE */
 #include <ctype.h>		/* isdigit */
 #include <stdlib.h>		/* atoi */
-#ifndef __BSD
+#ifndef __unix__
 	#include <malloc.h>
 #endif
 #include <string.h>
diff --git a/xtrn/sdk/xsdk.h b/xtrn/sdk/xsdk.h
index 265e20a2dc..bf15f81306 100644
--- a/xtrn/sdk/xsdk.h
+++ b/xtrn/sdk/xsdk.h
@@ -61,7 +61,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#ifndef __BSD		/* FreeBSD uses stdlib.h for malloc() */
+#ifndef __unix__
 	#include <malloc.h>
 #endif
 #include <sys/stat.h>
diff --git a/xtrn/sdk/xsdkinet.h b/xtrn/sdk/xsdkinet.h
index cee0f6a7ec..5e5682e301 100644
--- a/xtrn/sdk/xsdkinet.h
+++ b/xtrn/sdk/xsdkinet.h
@@ -52,9 +52,7 @@
 
 #elif defined __unix__	/* Unix-variant */
 
-#ifdef __BSD
 #include <sys/types.h>	/* u_intXX_t */
-#endif
 
 #include <netdb.h>		/* gethostbyname */
 #include <netinet/in.h>	/* IPPROTO_IP */
diff --git a/xtrn/sdk/xsdkwrap.c b/xtrn/sdk/xsdkwrap.c
index ef4cbc2815..a8ca317f90 100644
--- a/xtrn/sdk/xsdkwrap.c
+++ b/xtrn/sdk/xsdkwrap.c
@@ -49,11 +49,9 @@
 	#include <stdlib.h>
 	#include <unistd.h>
 	#include <termios.h>
-	#ifdef __BSD
-	#ifndef __OpenBSD__
+	#if defined(__FreeBSD__)
 	#include <sys/kbio.h>
-	#endif
-	#else
+	#elif defined(__Linux__)
 	#include <sys/kd.h>
 	#endif
 	#include <sys/time.h>
-- 
GitLab