Commit 1532a839 authored by Bodo Möller's avatar Bodo Möller
Browse files

synchronize with engine branch (some changes were done only 

there for no particular reason)
parent d77ee3b7

crypto/conf/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/conf/conf_api.c

+1 −1
Original line number Diff line number Diff line
@@ -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);