diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-06-04 18:21:24 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-06-04 18:21:47 +0200 |
| commit | 90d42e28f36cee77cbb12b99afb4d91d2baf9cf7 (patch) | |
| tree | 04adfb23c3baf6ccb8242854bc4f645614b6e304 /lib | |
| parent | 2bb76308fd83c8a2114ef0f9fc71136db8d7cb5e (diff) | |
| download | gnutls-90d42e28f36cee77cbb12b99afb4d91d2baf9cf7.tar.gz | |
define NN_HASH unconditionally
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/accelerated/x86/x86-common.h | 12 |
1 files changed, 6 insertions, 6 deletions
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 |