diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2015-10-01 07:47:44 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2015-10-01 07:47:44 +0000 |
| commit | ff14d03521a89636be959e65a21374951fe699ba (patch) | |
| tree | f50c4271d12b6939db067758ade30df93a038a91 /lib/isc/entropy.c | |
| parent | b04f5d3d3ff49c604e768add0cf35600b9eee074 (diff) | |
Notes
Diffstat (limited to 'lib/isc/entropy.c')
| -rw-r--r-- | lib/isc/entropy.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c index da9e81fb3129..66c196e5f718 100644 --- a/lib/isc/entropy.c +++ b/lib/isc/entropy.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2010, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -40,6 +40,7 @@ #include <isc/msgs.h> #include <isc/mutex.h> #include <isc/platform.h> +#include <isc/print.h> #include <isc/region.h> #include <isc/sha1.h> #include <isc/string.h> @@ -316,7 +317,12 @@ entropypool_adddata(isc_entropy_t *ent, void *p, unsigned int len, unsigned long addr; isc_uint8_t *buf; + /* Silly MSVC in 64 bit mode complains here... */ +#ifdef _WIN64 + addr = (unsigned long)((unsigned long long)p); +#else addr = (unsigned long)p; +#endif buf = p; if ((addr & 0x03U) != 0U) { |