diff options
author | Richard Levitte <levitte@openssl.org> | 2017-08-25 14:51:45 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-08-25 15:51:40 +0200 |
commit | 568a5210e0fde8b5cb6a70296276d4b4c3c7dd9b (patch) | |
tree | 49ac0a39bfe217669434d4f823cff617716ba9b6 /crypto | |
parent | 3bd605fd7a35f502e754527394611f103980dd08 (diff) |
NO_SYS_TYPES_H isn't defined anywhere, stop using it as a guard
This is a vestige from pre-1.1.0 OpenSSL
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4256)
(cherry picked from commit b379fe6cd046b9dd8a62309dcbaded763e2d4187)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/a_digest.c | 5 | ||||
-rw-r--r-- | crypto/asn1/a_sign.c | 5 | ||||
-rw-r--r-- | crypto/asn1/a_verify.c | 5 | ||||
-rw-r--r-- | crypto/rand/randfile.c | 4 | ||||
-rw-r--r-- | crypto/x509/by_dir.c | 4 |
5 files changed, 5 insertions, 18 deletions
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 46bff0d88f..c84ecc9b4b 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -9,13 +9,10 @@ #include <stdio.h> #include <time.h> +#include <sys/types.h> #include "internal/cryptlib.h" -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/buffer.h> diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 7e21a5ec9f..3b261eba41 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -9,13 +9,10 @@ #include <stdio.h> #include <time.h> +#include <sys/types.h> #include "internal/cryptlib.h" -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <openssl/bn.h> #include <openssl/evp.h> #include <openssl/x509.h> diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index 00ab136f02..fb3607cbbd 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -9,13 +9,10 @@ #include <stdio.h> #include <time.h> +#include <sys/types.h> #include "internal/cryptlib.h" -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <openssl/bn.h> #include <openssl/x509.h> #include <openssl/objects.h> diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 15fa9dce52..dbd03ff2bd 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -21,9 +21,7 @@ #ifdef OPENSSL_SYS_VMS # include <unixio.h> #endif -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #ifndef OPENSSL_NO_POSIX_IO # include <sys/stat.h> # include <fcntl.h> diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index f3a1f05428..21672a7ef5 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -10,12 +10,10 @@ #include <stdio.h> #include <time.h> #include <errno.h> +#include <sys/types.h> #include "internal/cryptlib.h" -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif #ifndef OPENSSL_NO_POSIX_IO # include <sys/stat.h> #endif |