From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 15 Dec 2013 22:32:43 +0000 (+0100)
Subject: use better definitions
X-Git-Tag: gnutls_3_3_0pre0~448
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41d286f1f977900c9ef7ccccaeb76a0ccf8fe4fa;p=thirdparty%2Fgnutls.git

use better definitions
---

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index a8b24c72c3..3a55f32b66 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -59,6 +59,10 @@ typedef int ssize_t;
 #define memxor gl_memxor
 #endif
 
+#ifdef ENABLE_CRYPTODEV
+# define ENABLE_ALIGN16
+#endif
+
 #ifdef __GNUC__
 #ifndef _GNUTLS_GCC_VERSION
 #define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
diff --git a/lib/gnutls_mbuffers.c b/lib/gnutls_mbuffers.c
index a2b6d5a674..077bfff96f 100644
--- a/lib/gnutls_mbuffers.c
+++ b/lib/gnutls_mbuffers.c
@@ -302,7 +302,7 @@ _mbuffer_append_data(mbuffer_st * bufel, void *newdata,
 	return 0;
 }
 
-#ifdef ENABLE_CRYPTODEV
+#ifdef ENABLE_ALIGN16
 # define ALIGN_SIZE 16
 
 /* Allocate a 16-byte alligned buffer segment. The segment is not initially "owned" by
diff --git a/lib/gnutls_mbuffers.h b/lib/gnutls_mbuffers.h
index a22ebbf521..353254d3b0 100644
--- a/lib/gnutls_mbuffers.h
+++ b/lib/gnutls_mbuffers.h
@@ -133,7 +133,7 @@ inline static void _mbuffer_xfree(mbuffer_st ** bufel)
 	*bufel = NULL;
 }
 
-#ifdef ENABLE_CRYPTODEV
+#ifdef ENABLE_ALIGN16
 mbuffer_st *_mbuffer_alloc_align16(size_t maximum_size, unsigned align_pos);
 int _mbuffer_linearize_align16(mbuffer_head_st * buf, unsigned align_pos);
 #else