32 lines
925 B
Plaintext
32 lines
925 B
Plaintext
$NetBSD: patch-aa,v 1.2 2016/08/24 10:34:10 wiz Exp $
|
|
|
|
make sure we get the defs in place before checking for them
|
|
|
|
--- src/crypto/ocb.cc.orig 2016-08-10 10:58:28.000000000 +0000
|
|
+++ src/crypto/ocb.cc
|
|
@@ -23,6 +23,8 @@
|
|
/ Comments are welcome: Ted Krovetz <ted@krovetz.net> - Dedicated to Laurel K
|
|
/------------------------------------------------------------------------- */
|
|
|
|
+#include "config.h"
|
|
+
|
|
/* ----------------------------------------------------------------------- */
|
|
/* Usage notes */
|
|
/* ----------------------------------------------------------------------- */
|
|
@@ -117,6 +119,7 @@
|
|
#endif
|
|
#endif
|
|
|
|
+#ifndef bswap64
|
|
#if _MSC_VER
|
|
#define bswap64(x) _byteswap_uint64(x)
|
|
#elif HAVE_DECL_BSWAP64
|
|
@@ -136,6 +139,7 @@
|
|
return out.u64;
|
|
}
|
|
#endif
|
|
+#endif
|
|
|
|
#if _MSC_VER
|
|
static inline unsigned ntz(unsigned x) {_BitScanForward(&x,x);return x;}
|