summaryrefslogtreecommitdiffstats
path: root/crypto/conf
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2002-04-18 09:27:14 +0000
committerBodo Möller <bodo@openssl.org>2002-04-18 09:27:14 +0000
commit1532a839fc3bfd6240d56997ec0df13cbaa5b868 (patch)
tree1d7f649bbf7940ae86c1ec5f1119eaeeaf2794cd /crypto/conf
parentd77ee3b75c5c995fe394cb271db6a755a48bdbf5 (diff)
synchronize with engine branch (some changes were done only
there for no particular reason)
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/Makefile.ssl2
-rw-r--r--crypto/conf/conf_api.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 9fa33bfb3e..c948fc8f6e 100644
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -5,7 +5,7 @@
DIR= conf
TOP= ../..
CC= cc
-INCLUDES= -I.. -I../.. -I../../include
+INCLUDES= -I.. -I../../include
CFLAG=-g
INSTALL_PREFIX=
OPENSSLDIR= /usr/local/ssl
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index a42c21970a..f6515b53e1 100644
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -67,7 +67,7 @@
#include <string.h>
#include <openssl/conf.h>
#include <openssl/conf_api.h>
-#include "e_os.h"
+#include "openssl/e_os.h"
static void value_free_hash(CONF_VALUE *a, LHASH *conf);
static void value_free_stack(CONF_VALUE *a,LHASH *conf);