Merge branch 'standalone-master' into standalone-renamencr-standalone-rename

Conflicts:
	crypto/userspace/libtomcrypt/misc/qsort.c
	crypto/userspace/libtommath/bn_mp_and.c
	crypto/userspace/libtommath/bn_mp_exteuclid.c
	crypto/userspace/libtommath/bn_mp_jacobi.c
	crypto/userspace/libtommath/bn_mp_or.c
	crypto/userspace/libtommath/bn_mp_prime_fermat.c
	crypto/userspace/libtommath/bn_mp_radix_size.c
	crypto/userspace/libtommath/bn_mp_radix_smap.c
	crypto/userspace/libtommath/bn_mp_read_radix.c
	crypto/userspace/libtommath/bn_mp_sqrt.c
	crypto/userspace/libtommath/bn_mp_toradix.c
	crypto/userspace/libtommath/bn_mp_toradix_n.c
	crypto/userspace/libtommath/bn_mp_xor.c
	examples/Makefile
	examples/ncr.c
	examples/pk.c

1 files changed, 2 insertions, 2 deletions

diff --git a/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h b/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h
index 8ad90bce4b0..93db10e6729 100644
--- a/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h
+++ b/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h
@@ -19,11 +19,11 @@
 #define LTC_EXPORT
 #endif
 
-LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
-
 /* certain platforms use macros for these, making the prototypes broken */
 #ifndef LTC_NO_PROTOTYPES
 
+LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
+
 /* you can change how memory allocation works ... */
 LTC_EXPORT void * LTC_CALL XMALLOC(size_t n);
 LTC_EXPORT void * LTC_CALL XREALLOC(void *p, size_t n);