From 03e0e196c5cb712499441819ab2f2222f5973cc0 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Wed, 3 May 2017 06:33:14 -0700
Subject: HAVE_SYS_TYPES_H config variable.

* configure (have_sys_types): New variable. Set to "y" in
various tests which prove that the <sys/types.h>
header is available.
(HAVE_SYS_TYPES_H): Add to config.h in the dependent
variale generation section, if have_sys_types is true.

* sysif.c: Use HAVE_SYS_TYPES_H instead of relying on
HAVE_MAKEDEV.
---
 configure | 16 ++++++++++++++++
 sysif.c   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 648c8d4c..8bfa16e6 100755
--- a/configure
+++ b/configure
@@ -126,6 +126,7 @@ debug_support=y
 gen_gc=y
 have_dbl_decimal_dig=
 have_unistd=
+have_sys_types=
 have_sys_time=
 have_syslog=
 have_glob=
@@ -1535,6 +1536,7 @@ if conftest ; then
   printf "yes\n"
   printf "#define HAVE_FORK_STUFF 1\n" >> config.h
   have_unistd=y
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -1556,6 +1558,7 @@ if conftest ; then
   printf "yes\n"
   printf "#define HAVE_GETPPID 1\n" >> config.h
   have_unistd=y
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -1943,6 +1946,7 @@ int main(void)
 if conftest ; then
   printf "yes\n"
   printf "#define HAVE_MAKEDEV 1\n" >> config.h
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -2257,6 +2261,7 @@ if conftest ; then
   printf "yes\n"
   printf "#define HAVE_GETEUID 1\n" >> config.h
   have_unistd=y
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -2283,6 +2288,7 @@ if conftest ; then
   printf "yes\n"
   printf "#define HAVE_SETRESUID 1\n" >> config.h
   have_unistd=y
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -2310,6 +2316,7 @@ elif conftest EXTRA_FLAGS=-D__EXTENSIONS__=1 ; then
   printf "#define HAVE_SETGROUPS 1\n" >> config.h
   lang_flags="$lang_flags -D__EXTENSIONS__=1" # Solaris buggery
   have_unistd=y
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -2335,6 +2342,7 @@ if conftest ; then
   printf "yes\n"
   printf "#define HAVE_PWUID 1\n" >> config.h
   have_pwuid=y
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -2572,10 +2580,12 @@ int main(int argc, char **argv)
 if conftest ; then
   printf "yes\n"
   printf "#define HAVE_FSEEKO 1\n" >> config.h
+  have_sys_types=y
 elif conftest EXTRA_FLAGS=-D_LARGEFILE_SOURCE ; then
   printf "yes\n"
   printf "#define HAVE_FSEEKO 1\n" >> config.h
   lang_flags="$lang_flags -D_LARGEFILE_SOURCE"
+  have_sys_types=y
 else
   printf "no\n"
 fi
@@ -2663,10 +2673,12 @@ if conftest ; then
   printf "yes\n"
   printf "#define HAVE_SOCKETS 1\n" >> config.h
   have_sockets=y
+  have_sys_types=y
 elif conftest EXTRA_LDFLAGS="-lsocket -lnsl" ; then
   printf "yes\n"
   printf "#define HAVE_SOCKETS 1\n" >> config.h
   have_sockets=y
+  have_sys_types=y
   conf_ldflags="${conf_ldflags:+"$conf_ldflags "}-lsocket -lnsl"
   printf "Need libs for sockets: regenerating config.make ..."
   gen_config_make
@@ -2821,6 +2833,10 @@ if [ -n "$have_unistd" ] ; then
   printf "#define HAVE_UNISTD_H 1\n" >> config.h
 fi
 
+if [ -n "$have_sys_types" ] ; then
+  printf "#define HAVE_SYS_TYPES_H 1\n" >> config.h
+fi
+
 if [ -n "$have_sys_time" ] ; then
   printf "#define HAVE_SYS_TIME 1\n" >> config.h
 fi
diff --git a/sysif.c b/sysif.c
index f9068bbf..96a8a504 100644
--- a/sysif.c
+++ b/sysif.c
@@ -50,7 +50,7 @@
 #if HAVE_WINDOWS_H
 #include <windows.h>
 #endif
-#if HAVE_MAKEDEV
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #if HAVE_POLL
-- 
cgit v1.2.3