The branch OpenSSL_1_1_0-stable has been updated via 568a5210e0fde8b5cb6a70296276d4b4c3c7dd9b (commit) from 3bd605fd7a35f502e754527394611f103980dd08 (commit)
- Log ----------------------------------------------------------------- commit 568a5210e0fde8b5cb6a70296276d4b4c3c7dd9b Author: Richard Levitte <levi...@openssl.org> Date: Fri Aug 25 14:51:45 2017 +0200 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 <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4256) (cherry picked from commit b379fe6cd046b9dd8a62309dcbaded763e2d4187) ----------------------------------------------------------------------- Summary of changes: apps/apps.c | 4 +--- crypto/asn1/a_digest.c | 5 +---- crypto/asn1/a_sign.c | 5 +---- crypto/asn1/a_verify.c | 5 +---- crypto/rand/randfile.c | 4 +--- crypto/x509/by_dir.c | 4 +--- e_os.h | 4 +--- include/openssl/buffer.h | 5 +---- include/openssl/seed.h | 4 +--- ssl/ssl_cert.c | 5 +---- 10 files changed, 10 insertions(+), 35 deletions(-) diff --git a/apps/apps.c b/apps/apps.c index 0a38cb0..d93b83b 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -18,9 +18,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#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/asn1/a_digest.c b/crypto/asn1/a_digest.c index 46bff0d..c84ecc9 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 7e21a5e..3b261eb 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 00ab136..fb3607c 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 15fa9dc..dbd03ff 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 f3a1f05..21672a7 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 diff --git a/e_os.h b/e_os.h index 8f52dd4..80a36f5 100644 --- a/e_os.h +++ b/e_os.h @@ -344,9 +344,7 @@ extern FILE *_imp___iob; # else # include <unistd.h> # endif -# ifndef NO_SYS_TYPES_H -# include <sys/types.h> -# endif +# include <sys/types.h> # ifdef OPENSSL_SYS_WIN32_CYGWIN # include <io.h> # include <fcntl.h> diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h index 91f0e07..35160b4 100644 --- a/include/openssl/buffer.h +++ b/include/openssl/buffer.h @@ -21,10 +21,7 @@ extern "C" { #endif # include <stddef.h> - -# if !defined(NO_SYS_TYPES_H) -# include <sys/types.h> -# endif +# include <sys/types.h> /* * These names are outdated as of OpenSSL 1.1; a future release diff --git a/include/openssl/seed.h b/include/openssl/seed.h index bb97131..de10b08 100644 --- a/include/openssl/seed.h +++ b/include/openssl/seed.h @@ -52,9 +52,7 @@ extern "C" { # endif # endif -# if !defined(NO_SYS_TYPES_H) -# include <sys/types.h> -# endif +# include <sys/types.h> # define SEED_BLOCK_SIZE 16 # define SEED_KEY_LENGTH 16 diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 0c931db..8699487 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -14,12 +14,9 @@ */ #include <stdio.h> +#include <sys/types.h> #include "e_os.h" -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif - #include "internal/o_dir.h" #include <openssl/lhash.h> #include <openssl/bio.h> _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits