[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] libcrypto: reorder valgrind.h include
[Thread Prev] | [Thread Next]
- Subject: [PATCH] libcrypto: reorder valgrind.h include
- From: Jon Simons <jon@xxxxxxxxxxxxx>
- Reply-to: libssh@xxxxxxxxxx
- Date: Tue, 29 Jan 2019 21:03:24 -0500
- To: libssh@xxxxxxxxxx
- Cc: Jon Simons <jon@xxxxxxxxxxxxx>
Before this change on my local system, libcrypto.c will fail to build citing problems with `__unused__`. After moving the header up, I no longer encounter the error. Signed-off-by: Jon Simons <jon@xxxxxxxxxxxxx> --- src/libcrypto.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libcrypto.c b/src/libcrypto.c index d578903f..cc000514 100644 --- a/src/libcrypto.c +++ b/src/libcrypto.c @@ -28,6 +28,11 @@ #include <sys/time.h> #endif +#if (defined(HAVE_VALGRIND_VALGRIND_H) && defined(HAVE_OPENSSL_IA32CAP_LOC)) +#include <valgrind/valgrind.h> +#define CAN_DISABLE_AESNI +#endif + #include "libssh/priv.h" #include "libssh/session.h" #include "libssh/crypto.h" @@ -54,11 +59,6 @@ #include <openssl/des.h> #endif -#if (defined(HAVE_VALGRIND_VALGRIND_H) && defined(HAVE_OPENSSL_IA32CAP_LOC)) -#include <valgrind/valgrind.h> -#define CAN_DISABLE_AESNI -#endif - #include "libssh/crypto.h" struct ssh_mac_ctx_struct { -- 2.19.1.593.gc670b1f
Archive administrator: postmaster@lists.cynapses.org