From 3d8036a72e4d1e91fc354eb6336d3459e1ee7c9c Mon Sep 17 00:00:00 2001
From: mpi <>
Date: Sun, 13 Apr 2014 21:11:19 +0000
Subject: Do not include "e_os.h" anymore.  Simply pull in the necessary
 headers.

ok miod@, deraadt@
---
 src/lib/libssl/ssl_cert.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/libssl/ssl_cert.c')

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 5123a89182..6d144077f9 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -114,13 +114,13 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <stdio.h>
+#include <sys/types.h>
 
-#include "e_os.h"
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <stdio.h>
+#include <unistd.h>
 
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include "o_dir.h"
 #include <openssl/objects.h>
 #include <openssl/bio.h>
@@ -837,7 +837,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 
 	if (errno)
 		{
-		SYSerr(SYS_F_OPENDIR, get_last_sys_error());
+		SYSerr(SYS_F_OPENDIR, errno);
 		ERR_add_error_data(3, "OPENSSL_DIR_read(&ctx, '", dir, "')");
 		SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB);
 		goto err;
-- 
cgit v1.2.3-55-g6feb