From a739707bfac111bf187dc49e8b40a27ad46f70b6 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Tue, 24 Jun 2014 19:37:59 +0000
Subject: Unifdef -UNO_SYS_TYPES_H

---
 lib/libcrypto/asn1/a_digest.c | 6 ++----
 lib/libcrypto/asn1/a_sign.c   | 6 ++----
 lib/libcrypto/asn1/a_verify.c | 6 ++----
 lib/libcrypto/buffer/buffer.h | 5 +----
 lib/libcrypto/x509/by_dir.c   | 6 ++----
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/lib/libcrypto/asn1/a_digest.c b/lib/libcrypto/asn1/a_digest.c
index 52b7b0720e7..751277f33ae 100644
--- a/lib/libcrypto/asn1/a_digest.c
+++ b/lib/libcrypto/asn1/a_digest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_digest.c,v 1.13 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: a_digest.c,v 1.14 2014/06/24 19:37:58 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -61,9 +61,7 @@
 
 #include "cryptlib.h"
 
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/lib/libcrypto/asn1/a_sign.c b/lib/libcrypto/asn1/a_sign.c
index 1cd9fdaecf3..5f2a5e6253d 100644
--- a/lib/libcrypto/asn1/a_sign.c
+++ b/lib/libcrypto/asn1/a_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_sign.c,v 1.17 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: a_sign.c,v 1.18 2014/06/24 19:37:58 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -114,9 +114,7 @@
 
 #include "cryptlib.h"
 
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
diff --git a/lib/libcrypto/asn1/a_verify.c b/lib/libcrypto/asn1/a_verify.c
index 9ff6f94e164..cf6c9bbf44e 100644
--- a/lib/libcrypto/asn1/a_verify.c
+++ b/lib/libcrypto/asn1/a_verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_verify.c,v 1.18 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: a_verify.c,v 1.19 2014/06/24 19:37:58 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,7 @@
 #include "cryptlib.h"
 #include "asn1_locl.h"
 
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #include <openssl/bn.h>
 #include <openssl/x509.h>
diff --git a/lib/libcrypto/buffer/buffer.h b/lib/libcrypto/buffer/buffer.h
index bdffc346b9f..c3d140b392e 100644
--- a/lib/libcrypto/buffer/buffer.h
+++ b/lib/libcrypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.10 2014/06/14 10:28:31 avsm Exp $ */
+/* $OpenBSD: buffer.h,v 1.11 2014/06/24 19:37:58 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,10 +66,7 @@ extern "C" {
 #endif
 
 #include <stddef.h>
-
-#if !defined(NO_SYS_TYPES_H)
 #include <sys/types.h>
-#endif
 
 /* Already declared in ossl_typ.h */
 /* typedef struct buf_mem_st BUF_MEM; */
diff --git a/lib/libcrypto/x509/by_dir.c b/lib/libcrypto/x509/by_dir.c
index 187eba45155..b4c00c820cd 100644
--- a/lib/libcrypto/x509/by_dir.c
+++ b/lib/libcrypto/x509/by_dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_dir.c,v 1.28 2014/06/23 22:19:02 deraadt Exp $ */
+/* $OpenBSD: by_dir.c,v 1.29 2014/06/24 19:37:58 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,7 @@
 
 #include "cryptlib.h"
 
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifndef OPENSSL_NO_POSIX_IO
 # include <sys/stat.h>
 #endif
-- 
cgit v1.2.3