summaryrefslogtreecommitdiffstats
path: root/apps/apps.h
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-09-01 08:50:03 +1000
committerPauli <paul.dale@oracle.com>2017-09-01 09:55:43 +1000
commit4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0 (patch)
tree550e4d3cf715378bb9b609caede0a1091a816cda /apps/apps.h
parent75551e07bd2339dfea06ef1d31d69929e13a4495 (diff)
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 'apps/apps.h')
-rw-r--r--apps/apps.h5
1 files changed, 1 insertions, 4 deletions
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>