summaryrefslogtreecommitdiffstats
path: root/apps/apps.h
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-08-18 13:52:46 +1000
committerPauli <paul.dale@oracle.com>2017-08-30 07:20:43 +1000
commit677963e5a428739062ab5d46d5baed5eadd0195d (patch)
tree3afe5ace573d0da8a5272575075ad4aede8dcec5 /apps/apps.h
parent58891025eff2fb42a6a5cf2fa861d46308826d07 (diff)
e_os.h removal from other headers and source files.
Removed e_os.h from all bar three headers (apps/apps.h crypto/bio/bio_lcl.h and ssl/ssl_locl.h). Added e_os.h into the files that need it now. Directly reference internal/nelem.h when required. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4188)
Diffstat (limited to 'apps/apps.h')
-rw-r--r--apps/apps.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/apps.h b/apps/apps.h
index fdf316a08e..bbc9a5ad8f 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
#ifndef HEADER_APPS_H
# define HEADER_APPS_H
+# include "internal/nelem.h"
# include "e_os.h"
# if defined(__unix) || defined(__unix__)
# include <sys/time.h> /* struct timeval for DTLS */