From 396e16880d3940ea6564169ed13a52de899875b2 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 9 Oct 2015 08:50:49 +0200
Subject: [PATCH] Move CRYPTO_ALIGN to sodium/export.h

---
 src/libsodium/include/sodium/crypto_generichash_blake2b.h | 6 ------
 src/libsodium/include/sodium/export.h                     | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h
index cddfdaa6..a88a59ec 100644
--- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h
+++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h
@@ -7,12 +7,6 @@
 
 #include "export.h"
 
-#if defined(_MSC_VER)
-# define CRYPTO_ALIGN(x) __declspec(align(x))
-#else
-# define CRYPTO_ALIGN(x) __attribute__((aligned(x)))
-#endif
-
 #ifdef __cplusplus
 # if __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
diff --git a/src/libsodium/include/sodium/export.h b/src/libsodium/include/sodium/export.h
index 53fcd7b5..aeb6d0e2 100644
--- a/src/libsodium/include/sodium/export.h
+++ b/src/libsodium/include/sodium/export.h
@@ -29,4 +29,12 @@
 # endif
 #endif
 
+#ifndef CRYPTO_ALIGN
+# if defined(_MSC_VER)
+#  define CRYPTO_ALIGN(x) __declspec(align(x))
+# else
+#  define CRYPTO_ALIGN(x) __attribute__((aligned(x)))
+# endif
+#endif
+
 #endif