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)

diff --git a/apps/apps.c b/apps/apps.c
index 0a38cb009c0cf4062e77e4dd43dab7262016f476..d93b83bfdd7d1f95e9dfa1a7238e809c60da5f4d 100644 (file)
--- 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 46bff0d88f0282fd53f7648daaee3bf8f00ae9cc..c84ecc9b4bce9cd0a8a00a77daa50e6345245448 100644 (file)
--- 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 7e21a5ec9fbde270cb7b381dc529fdd2f5271fa9..3b261eba419af730e3b37afbaf42cad72f38576b 100644 (file)
--- 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 00ab136f022347a6293b750a1579d6e2f0af26c7..fb3607cbbd41bdcb4a47f1da7c4d1dfa11157845 100644 (file)
--- 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 15fa9dce52d3ffb835c7d12d84125a4122cfbda2..dbd03ff2bd009cd2f4e3237d0696db7e1a44b222 100644 (file)
--- 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 f3a1f05428a8baf22fd47d4a06a145ec05cfc599..21672a7ef55176d9d27db68cc742eafbef64aa71 100644 (file)
--- 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 8f52dd47f6f3d5befc8057db70cce8a11d524e79..80a36f5299770d695f4a6c540a39d46d672767c7 100644 (file)
--- 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 91f0e07ff91a320e371470d4f230dd5bb6a009aa..35160b4f2643e9cd9d0cc9f35adb57cd20f618a3 100644 (file)
--- 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 bb97131d76b89d217b8d28e9239725b11c9f1009..de10b08572018aceada115b3f21249222acfedf1 100644 (file)
--- 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 0c931db97d6f325d62d7caec465403f27b520d04..8699487af27c1e5eab99294ec2928436cc35b9d0 100644 (file)
--- 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>