From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 24 Mar 2015 07:36:33 +0000 (+0100)
Subject: drop support for gnulib's u64
X-Git-Tag: gnutls_3_4_0~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eac44b665c0924fa950195a2b6d890638b41fc7d;p=thirdparty%2Fgnutls.git

drop support for gnulib's u64
---

diff --git a/lib/accelerated/x86/aes-gcm-x86-pclmul.c b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
index b3f81feb1c..1ae6b80c05 100644
--- a/lib/accelerated/x86/aes-gcm-x86-pclmul.c
+++ b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
@@ -58,10 +58,10 @@ struct aes_gcm_ctx {
 	struct gcm128_context gcm;
 };
 
-void gcm_init_clmul(u128 Htable[16], const u64 Xi[2]);
+void gcm_init_clmul(u128 Htable[16], const uint64_t Xi[2]);
 void gcm_ghash_clmul(uint64_t Xi[2], const u128 Htable[16],
 		     const uint8_t * inp, size_t len);
-void gcm_gmult_clmul(u64 Xi[2], const u128 Htable[16]);
+void gcm_gmult_clmul(uint64_t Xi[2], const u128 Htable[16]);
 
 static void aes_gcm_deinit(void *_ctx)
 {
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index da09adc40f..5a59ef9c3e 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -56,7 +56,6 @@ typedef int ssize_t;
 #include <ws2tcpip.h>
 #endif
 #include <time.h>
-#include <u64.h>		/* gnulib for uint64_t */
 
 #ifdef HAVE_LIBNETTLE
 #include <nettle/memxor.h>