Recent changes from 0.9.6-stable.

diff --git a/apps/apps.h b/apps/apps.h
index f0398150d7aab3edf684550a4438bd6c2db117b3..ae70d33b85b994f6da9ef3f97aafedc0013ab7c8 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
-#include "openssl/e_os.h"
+#include "e_os.h"
 
 #include <openssl/buffer.h>
 #include <openssl/bio.h>

diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c
index 212edfaf622e0395a29d44fc4e9bcd5f117d3b9b..42e00963e7cc785b1ba5297da1e49be40edb71e4 100644 (file)
--- a/crypto/bf/bftest.c
+++ b/crypto/bf/bftest.c
@@ -63,7 +63,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../e_os.h"
+#include "e_os.h"
 
 #ifdef NO_BF
 int main(int argc, char *argv[])

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 4a794bfb66a9cebc277fb8c51195a63c9b55acaa..1f547863f5fb6e1c40ecce75d1cf9952383899be 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -84,7 +84,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "openssl/e_os.h"
+#include "e_os.h"
 
 /* VxWorks defines SSiZE_MAX with an empty value causing compile errors */
 #if defined(VXWORKS)

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 075b79db05806bb0778ca1ab603293d24d99857e..390488a37db240d3c099d48b809b89fe8863b6fb 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -62,7 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "openssl/e_os.h"
+#include "e_os.h"
 
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>