From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 4 Jun 2014 16:21:24 +0000 (+0200)
Subject: define NN_HASH unconditionally
X-Git-Tag: gnutls_3_3_5~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90d42e28f36cee77cbb12b99afb4d91d2baf9cf7;p=thirdparty%2Fgnutls.git

define NN_HASH unconditionally
---

diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h
index 03fc8dea25..647c7d6cba 100644
--- a/lib/accelerated/x86/x86-common.h
+++ b/lib/accelerated/x86/x86-common.h
@@ -29,11 +29,13 @@ extern unsigned int _gnutls_x86_cpuid_s[4];
 void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
 		  unsigned int *cx, unsigned int *dx);
 
-#ifdef ASM_X86_32
+# ifdef ASM_X86_32
 unsigned int gnutls_have_cpuid(void);
-#else
-#define gnutls_have_cpuid() 1
-#endif				/* ASM_X86_32 */
+# else
+#  define gnutls_have_cpuid() 1
+# endif				/* ASM_X86_32 */
+
+#endif
 
 #define NN_HASH(name, update_func, digest_func, NAME) {	\
  #name,						\
@@ -44,5 +46,3 @@ unsigned int gnutls_have_cpuid(void);
  (nettle_hash_update_func *) update_func,	\
  (nettle_hash_digest_func *) digest_func	\
 } 
-
-#endif