Module Name: src
Committed By: spz
Date: Mon Jun 6 05:40:34 UTC 2011
Modified Files:
src/external/bsd/bind/dist/lib/dns: openssl_link.c
Log Message:
fix up OPENSSL_VERSION_NUMBER check for entropy_add so it deals with the
current situation. Compile-checked by dholland, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/dns/openssl_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/openssl_link.c
diff -u src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.4 src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.5
--- src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.4 Wed Feb 16 03:47:04 2011
+++ src/external/bsd/bind/dist/lib/dns/openssl_link.c Mon Jun 6 05:40:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: openssl_link.c,v 1.4 2011/02/16 03:47:04 christos Exp $ */
+/* $NetBSD: openssl_link.c,v 1.5 2011/06/06 05:40:34 spz Exp $ */
/*
* Portions Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
@@ -98,7 +98,7 @@
return (result == ISC_R_SUCCESS ? 1 : -1);
}
-#if OPENSSL_VERSION_NUMBER < 0x10000000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
static void
#else
static int
@@ -110,7 +110,7 @@
UNUSED(buf);
UNUSED(num);
UNUSED(entropy);
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
return 0;
#endif
}
