Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/bind/dist/lib/dns fix up OPENSSL_VERSION_NUMBER...



details:   https://anonhg.NetBSD.org/src/rev/1dcbc3726b99
branches:  trunk
changeset: 765786:1dcbc3726b99
user:      spz <spz%NetBSD.org@localhost>
date:      Mon Jun 06 05:40:34 2011 +0000

description:
fix up OPENSSL_VERSION_NUMBER check for entropy_add so it deals with the
current situation. Compile-checked by dholland, thanks.

diffstat:

 external/bsd/bind/dist/lib/dns/openssl_link.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4bc36cc4662a -r 1dcbc3726b99 external/bsd/bind/dist/lib/dns/openssl_link.c
--- a/external/bsd/bind/dist/lib/dns/openssl_link.c     Mon Jun 06 03:15:14 2011 +0000
+++ b/external/bsd/bind/dist/lib/dns/openssl_link.c     Mon Jun 06 05:40:34 2011 +0000
@@ -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
 }



Home | Main Index | Thread Index | Old Index