From bf2855be5890a34d1bffcf902c0974b4cb136674 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Thu, 24 Dec 2020 10:55:58 +0700
Subject: [PATCH] Use the real gethostid on Solaris. (#121)

* 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.

* 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 +---
 src/uutils.c   | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/inc/version.h b/inc/version.h
index 938104f..0f7aa6d 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 775a0aa..fc3a1dd 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"
diff --git a/src/uutils.c b/src/uutils.c
index be7afa5..4325142 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		*/