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)
---
 e_os.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'e_os.h')

diff --git a/e_os.h b/e_os.h
index c1b9350d62..e76fb43a4d 100644
--- a/e_os.h
+++ b/e_os.h
@@ -234,6 +234,12 @@ extern FILE *_imp___iob;
 
 # else                          /* The non-microsoft world */
 
+#  if defined(OPENSSL_SYS_VXWORKS)
+#   include <sys/times.h>
+#  else
+#   include <sys/time.h>
+#  endif
+
 #  ifdef OPENSSL_SYS_VMS
 #   define VMS 1
   /*
-- 
cgit v1.2.3