summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-09-01 00:50:03 +0200
committerPauli <paul.dale@oracle.com>2017-09-01 01:55:43 +0200
commit4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0 (patch)
tree550e4d3cf715378bb9b609caede0a1091a816cda /e_os.h
parentAddress feedback (diff)
downloadopenssl-4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0.tar.xz
openssl-4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0.zip
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)
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h6
1 files changed, 6 insertions, 0 deletions
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
/*