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 b3f81feb1c35b0c629f3ada10c55e49c53115259..1ae6b80c0538a79966c6909f3170a0142f129195 100644 (file)
--- 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 da09adc40fd7dccb12c41173fb5decd4446212e9..5a59ef9c3e6687691aad0a861ddc212194d549d1 100644 (file)
--- 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>