unistd.h is always in the same place; no need to #include the result of

a maze of conditional #define's

3 files changed, 3 insertions, 11 deletions

diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h
index a3b512e9b0..cf7811041e 100644
--- a/src/lib/libcrypto/des/des_locl.h
+++ b/src/lib/libcrypto/des/des_locl.h
@@ -70,16 +70,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef OPENSSL_SYS_MSDOS
-#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
-#ifdef OPENSSL_UNISTD
-# include OPENSSL_UNISTD
-#else
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <math.h>
-#endif
-#endif
 #include <openssl/des.h>
 
 #ifdef OPENSSL_SYS_MSDOS                /* Visual C++ 2.1 (Windows NT/95) */
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c
index 2df82962c5..c713c5e319 100644
--- a/src/lib/libcrypto/des/des_opts.c
+++ b/src/lib/libcrypto/des/des_opts.c
@@ -66,7 +66,7 @@
 #include <stdio.h>
 #ifndef OPENSSL_SYS_MSDOS
 #include <openssl/e_os2.h>
-#include OPENSSL_UNISTD
+#include <unistd.h>
 #else
 #include <io.h>
 extern void exit();
diff --git a/src/lib/libcrypto/des/speed.c b/src/lib/libcrypto/des/speed.c
index 1616f4b7c9..67a8edf00f 100644
--- a/src/lib/libcrypto/des/speed.c
+++ b/src/lib/libcrypto/des/speed.c
@@ -66,7 +66,7 @@
 #include <stdio.h>
 
 #include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
+#include <unistd.h>
 OPENSSL_DECLARE_EXIT
 
 #ifndef OPENSSL_SYS_NETWARE