From e10a84350fbfdf0f5937c44b03e90c4bb283f0e2 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 21 Oct 2013 21:51:59 -0700
Subject: [PATCH] Keep crypto_stream_salsa* constants close to their wrappers

---
 src/libsodium/include/sodium/crypto_stream_salsa2012.h | 5 ++---
 src/libsodium/include/sodium/crypto_stream_salsa208.h  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h
index 742a7a1a..674729d3 100644
--- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h
+++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h
@@ -12,16 +12,15 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_stream_salsa2012_KEYBYTES 32U
-#define crypto_stream_salsa2012_NONCEBYTES 8U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_stream_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_stream_salsa2012_keybytes(void);
 
+#define crypto_stream_salsa2012_NONCEBYTES 8U
 SODIUM_EXPORT
 size_t crypto_stream_salsa2012_noncebytes(void);
 
diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h
index cd6742ce..200fcc03 100644
--- a/src/libsodium/include/sodium/crypto_stream_salsa208.h
+++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h
@@ -12,16 +12,15 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_stream_salsa208_KEYBYTES 32U
-#define crypto_stream_salsa208_NONCEBYTES 8U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_stream_salsa208_keybytes(void);
 
+#define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
 size_t crypto_stream_salsa208_noncebytes(void);