summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ui
diff options
context:
space:
mode:
authorjsing <>2014-05-24 09:16:08 +0000
committerjsing <>2014-05-24 09:16:08 +0000
commitea9d79c4cd69bfc81e564708ee81e8e5285d79e2 (patch)
tree8c5241e44e7eefe5e9cdf6e12a5a011a5242602f /src/lib/libcrypto/ui
parentce3ee9f6ea8937b30c7cfc80a18da648c9ba5ac4 (diff)
downloadopenbsd-ea9d79c4cd69bfc81e564708ee81e8e5285d79e2.tar.gz
openbsd-ea9d79c4cd69bfc81e564708ee81e8e5285d79e2.tar.bz2
openbsd-ea9d79c4cd69bfc81e564708ee81e8e5285d79e2.zip
Almost nothing actually needs to include <openssl/e_os2.h>, however by
including it they get <openssl/opensslconf.h>. So instead of pulling in <openssl/e_os2.h>, just pull in <openssl/opensslconf.h>. "go ahead" miod@
Diffstat (limited to 'src/lib/libcrypto/ui')
-rw-r--r--src/lib/libcrypto/ui/ui_lib.c5
-rw-r--r--src/lib/libcrypto/ui/ui_openssl.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index 0d3a960052..db0ef98b72 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/ui/ui_lib.c
@@ -57,8 +57,11 @@
57 */ 57 */
58 58
59#include <string.h> 59#include <string.h>
60
61#include <openssl/opensslconf.h>
62
60#include "cryptlib.h" 63#include "cryptlib.h"
61#include <openssl/e_os2.h> 64
62#include <openssl/buffer.h> 65#include <openssl/buffer.h>
63#include <openssl/ui.h> 66#include <openssl/ui.h>
64#include <openssl/err.h> 67#include <openssl/err.h>
diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c
index 3b79ecaf02..4ad98e4d2e 100644
--- a/src/lib/libcrypto/ui/ui_openssl.c
+++ b/src/lib/libcrypto/ui/ui_openssl.c
@@ -114,7 +114,7 @@
114 * [including the GNU Public Licence.] 114 * [including the GNU Public Licence.]
115 */ 115 */
116 116
117#include <openssl/e_os2.h> 117#include <openssl/opensslconf.h>
118 118
119#include <signal.h> 119#include <signal.h>
120#include <stdio.h> 120#include <stdio.h>