From 7c9de954cdfbe2ca95d418902861cd4db7caccfa Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Tue, 22 Dec 2020 23:24:07 +0700
Subject: [PATCH 1/2] Use the real gethostid on Solaris.

Solaris has this, so we might as well use it like we do on other
platforms. This value is used in response to queries from it from
Lisp.
---
 src/uutils.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/uutils.c b/src/uutils.c
index be7afa53..4325142e 100644
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -40,10 +40,6 @@
 #include "osmsgdefs.h"
 #include "uraiddefs.h"
 
-#ifdef OS5
-#define gethostid() 0
-#endif /* OS5 */
-
 /************************************************************************/
 /*									*/
 /*		l i s p _ s t r i n g _ t o _ c _ s t r i n g		*/

From 665fd21d0854c6b0ed03ed222187b0ee20551ab0 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Wed, 23 Dec 2020 00:29:49 +0700
Subject: [PATCH 2/2] Improve undefining of HAS_GETHOSTID.

Enable it on Solaris in `inc/version.h`. This file already
disables it on DOS, so no need to do so again in `src/initsout.c`.
---
 inc/version.h  | 1 -
 src/initsout.c | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/inc/version.h b/inc/version.h
index 938104f9..0f7aa6d9 100755
--- a/inc/version.h
+++ b/inc/version.h
@@ -231,7 +231,6 @@ typedef signed char s_char;
 	/********************************************************/
 #ifdef OS5
 		/* Solaris, sort of SYSV-ish, but not really */
-#undef HAS_GETHOSTID
 #define SYSVSIGNALS 1
 #define NOFORN
 #define LOCK_X_UPDATES 1
diff --git a/src/initsout.c b/src/initsout.c
index 775a0aaf..fc3a1dd4 100644
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -24,9 +24,7 @@
 
 #ifndef DOS
 #include <pwd.h>
-#else
-#undef HAS_GETHOSTID
-#endif /* DOS */
+#endif
 
 #include "hdw_conf.h"
 #include "lispemul.h"