Skip to content
Snippets Groups Projects
Commit 788ba4ab authored by Niels Möller's avatar Niels Möller
Browse files

* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1

on w64.

Rev: nettle/ChangeLog:1.237
Rev: nettle/configure.ac:1.51
parent 40d9583f
No related branches found
No related tags found
No related merge requests found
2011-11-24 Niels Mller <nisse@lysator.liu.se> 2011-11-24 Niels Mller <nisse@lysator.liu.se>
* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
on w64.
* serpent-internal.h (ROL64): Use (uint64_t) 1 rather than 1L, for * serpent-internal.h (ROL64): Use (uint64_t) 1 rather than 1L, for
systems. Needed for M$ w64. systems. Needed for M$ w64.
(RSHIFT64): Likewise. Also added a missing parenthesis. (RSHIFT64): Likewise. Also added a missing parenthesis.
......
...@@ -579,7 +579,7 @@ if test x$enable_openssl = xyes ; then ...@@ -579,7 +579,7 @@ if test x$enable_openssl = xyes ; then
fi fi
AH_TEMPLATE([WITH_OPENSSL], AH_TEMPLATE([WITH_OPENSSL],
[Define if you have openssl's libcrypto (used for benchmarking)]) [Define if you have openssl's libcrypto (used for benchmarking)]) dnl'
if test x$enable_openssl = xyes ; then if test x$enable_openssl = xyes ; then
AC_DEFINE(WITH_OPENSSL) AC_DEFINE(WITH_OPENSSL)
...@@ -587,10 +587,13 @@ fi ...@@ -587,10 +587,13 @@ fi
AC_SUBST(OPENSSL_LIBFLAGS) AC_SUBST(OPENSSL_LIBFLAGS)
# Choose strategy for Camellia round
AH_BOTTOM( AH_BOTTOM(
[/* Needs include of <limits.h> before use. */ [#if defined(__x86_64__) || defined(__arch64__)
# define HAVE_NATIVE_64_BIT 1
#else
/* Needs include of <limits.h> before use. */
# define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64) # define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64)
#endif
]) ])
# clock_gettime is in librt on *-*-osf5.1 and on glibc, so add -lrt to # clock_gettime is in librt on *-*-osf5.1 and on glibc, so add -lrt to
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment