From 4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Fri, 1 Sep 2017 08:50:03 +1000
Subject: struct timeval include guards

Move struct timeval includes into e_os.h (where the Windows ones were).
Enaure that the include is guarded canonically.

Refer #4271

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4312)
---
 apps/apps.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'apps')

diff --git a/apps/apps.h b/apps/apps.h
index c208c1999d..6984f166e8 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -10,11 +10,8 @@
 #ifndef HEADER_APPS_H
 # define HEADER_APPS_H
 
-# include "e_os.h"
+# include "e_os.h" /* struct timeval for DTLS */
 # include "internal/nelem.h"
-# if defined(__unix) || defined(__unix__)
-#  include <sys/time.h> /* struct timeval for DTLS */
-# endif
 # include <assert.h>
 
 # include <openssl/e_os2.h>
-- 
cgit v1.2.3