From 50a3fef3b6e05ce53175dbc182232e5c3b0defbf Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Thu, 17 Apr 2014 10:24:08 +0000 Subject: unistd.h is always in the same place; no need to #include the result of a maze of conditional #define's --- src/lib/libcrypto/bf/bf_opts.c | 2 +- src/lib/libcrypto/bf/bfspeed.c | 2 +- src/lib/libcrypto/cast/cast_spd.c | 2 +- src/lib/libcrypto/cast/castopts.c | 2 +- src/lib/libcrypto/des/des_locl.h | 10 +--------- src/lib/libcrypto/des/des_opts.c | 2 +- src/lib/libcrypto/des/speed.c | 2 +- src/lib/libcrypto/idea/idea_spd.c | 2 +- src/lib/libcrypto/opensslconf.h.in | 3 --- src/lib/libcrypto/rc2/rc2speed.c | 2 +- src/lib/libcrypto/rc4/rc4speed.c | 2 +- src/lib/libcrypto/rc5/rc5speed.c | 2 +- 12 files changed, 11 insertions(+), 22 deletions(-) (limited to 'src/lib/libcrypto') diff --git a/src/lib/libcrypto/bf/bf_opts.c b/src/lib/libcrypto/bf/bf_opts.c index 1721bb99b4..7a2a8b571c 100644 --- a/src/lib/libcrypto/bf/bf_opts.c +++ b/src/lib/libcrypto/bf/bf_opts.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/bf/bfspeed.c b/src/lib/libcrypto/bf/bfspeed.c index c41ef3b403..4fbf81d00c 100644 --- a/src/lib/libcrypto/bf/bfspeed.c +++ b/src/lib/libcrypto/bf/bfspeed.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/cast/cast_spd.c b/src/lib/libcrypto/cast/cast_spd.c index d650af475c..0f99e0e570 100644 --- a/src/lib/libcrypto/cast/cast_spd.c +++ b/src/lib/libcrypto/cast/cast_spd.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/cast/castopts.c b/src/lib/libcrypto/cast/castopts.c index 33b2c7b06f..f18a49bd6e 100644 --- a/src/lib/libcrypto/cast/castopts.c +++ b/src/lib/libcrypto/cast/castopts.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE 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 #include -#ifndef OPENSSL_SYS_MSDOS -#if !defined(OPENSSL_SYS_VMS) || defined(__DECC) -#ifdef OPENSSL_UNISTD -# include OPENSSL_UNISTD -#else -# include -#endif +#include #include -#endif -#endif #include #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 #ifndef OPENSSL_SYS_MSDOS #include -#include OPENSSL_UNISTD +#include #else #include 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 #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/idea/idea_spd.c b/src/lib/libcrypto/idea/idea_spd.c index 699353e871..cce4be9e6f 100644 --- a/src/lib/libcrypto/idea/idea_spd.c +++ b/src/lib/libcrypto/idea/idea_spd.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/opensslconf.h.in b/src/lib/libcrypto/opensslconf.h.in index 97e3745563..4c92f144cb 100644 --- a/src/lib/libcrypto/opensslconf.h.in +++ b/src/lib/libcrypto/opensslconf.h.in @@ -10,9 +10,6 @@ #endif #endif -#undef OPENSSL_UNISTD -#define OPENSSL_UNISTD - #undef OPENSSL_EXPORT_VAR_AS_FUNCTION #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) diff --git a/src/lib/libcrypto/rc2/rc2speed.c b/src/lib/libcrypto/rc2/rc2speed.c index 85cf6f65bf..31bfc453f5 100644 --- a/src/lib/libcrypto/rc2/rc2speed.c +++ b/src/lib/libcrypto/rc2/rc2speed.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/rc4/rc4speed.c b/src/lib/libcrypto/rc4/rc4speed.c index 0ebd38123d..a1207231fa 100644 --- a/src/lib/libcrypto/rc4/rc4speed.c +++ b/src/lib/libcrypto/rc4/rc4speed.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE diff --git a/src/lib/libcrypto/rc5/rc5speed.c b/src/lib/libcrypto/rc5/rc5speed.c index 8e363be535..3bcc8f49c0 100644 --- a/src/lib/libcrypto/rc5/rc5speed.c +++ b/src/lib/libcrypto/rc5/rc5speed.c @@ -66,7 +66,7 @@ #include #include -#include OPENSSL_UNISTD_IO +#include OPENSSL_DECLARE_EXIT #ifndef OPENSSL_SYS_NETWARE -- cgit v1.2.3-55-g6feb