From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 27 Apr 2014 17:34:38 +0000 (+0200)
Subject: x86.h was renamed to x86-common.h to avoid clashes with system headers.
X-Git-Tag: gnutls_3_3_2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bcd4c6d0f110a98cef52d9cf892cedb2dac81ff;p=thirdparty%2Fgnutls.git

x86.h was renamed to x86-common.h to avoid clashes with system headers.
---

diff --git a/lib/accelerated/accelerated.c b/lib/accelerated/accelerated.c
index dc2ba46e1c..aa7044990c 100644
--- a/lib/accelerated/accelerated.c
+++ b/lib/accelerated/accelerated.c
@@ -24,7 +24,7 @@
 #include <accelerated.h>
 #if defined(ASM_X86)
 #include <x86/aes-x86.h>
-#include <x86/x86.h>
+#include <x86/x86-common.h>
 #endif
 
 void _gnutls_register_accel_crypto(void)
diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index c0e71cc06b..e6bb215711 100644
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = README license.txt files.mk
 noinst_LTLIBRARIES = libx86.la
 
 libx86_la_SOURCES = sha-padlock.c hmac-padlock.c x86-common.c aes-padlock.c aes-gcm-padlock.c \
-	aes-padlock.h aes-x86.h x86.h sha-padlock.h sha-x86-ssse3.c sha-x86.h hmac-x86-ssse3.c \
+	aes-padlock.h aes-x86.h x86-common.h sha-padlock.h sha-x86-ssse3.c sha-x86.h hmac-x86-ssse3.c \
 	aes-gcm-x86-ssse3.c aes-gcm-x86-aesni.c aes-cbc-x86-ssse3.c aes-cbc-x86-aesni.c
 
 include files.mk
diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
index 1a2681f4d3..74a67e7da4 100644
--- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
@@ -31,7 +31,7 @@
 #include <gnutls_errors.h>
 #include <aes-x86.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 
 struct aes_ctx {
 	AES_KEY expanded_key;
diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
index 2b2440a5d4..0617d203c8 100644
--- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
@@ -31,7 +31,7 @@
 #include <gnutls_errors.h>
 #include <aes-x86.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 
 struct aes_ctx {
 	AES_KEY expanded_key;
diff --git a/lib/accelerated/x86/aes-gcm-padlock.c b/lib/accelerated/x86/aes-gcm-padlock.c
index 4b49521fd9..e1ad56699b 100644
--- a/lib/accelerated/x86/aes-gcm-padlock.c
+++ b/lib/accelerated/x86/aes-gcm-padlock.c
@@ -32,7 +32,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 #include <nettle/gcm.h>
 #include <aes-padlock.h>
diff --git a/lib/accelerated/x86/aes-gcm-x86-aesni.c b/lib/accelerated/x86/aes-gcm-x86-aesni.c
index 55bc5b0fab..7428940d3d 100644
--- a/lib/accelerated/x86/aes-gcm-x86-aesni.c
+++ b/lib/accelerated/x86/aes-gcm-x86-aesni.c
@@ -33,7 +33,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 #include <nettle/gcm.h>
 #include <aes-x86.h>
diff --git a/lib/accelerated/x86/aes-gcm-x86-pclmul.c b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
index c5f23b5abe..1e52a70b18 100644
--- a/lib/accelerated/x86/aes-gcm-x86-pclmul.c
+++ b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
@@ -30,7 +30,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 
 #define GCM_BLOCK_SIZE 16
diff --git a/lib/accelerated/x86/aes-gcm-x86-ssse3.c b/lib/accelerated/x86/aes-gcm-x86-ssse3.c
index 68332387cc..026ffb23b5 100644
--- a/lib/accelerated/x86/aes-gcm-x86-ssse3.c
+++ b/lib/accelerated/x86/aes-gcm-x86-ssse3.c
@@ -32,7 +32,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 #include <nettle/gcm.h>
 #include <aes-x86.h>
diff --git a/lib/accelerated/x86/aes-padlock.c b/lib/accelerated/x86/aes-padlock.c
index adc7e00394..98cdfc274b 100644
--- a/lib/accelerated/x86/aes-padlock.c
+++ b/lib/accelerated/x86/aes-padlock.c
@@ -30,7 +30,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #ifdef HAVE_LIBNETTLE
 # include <nettle/aes.h>		/* for key generation in 192 and 256 bits */
 # include <sha-padlock.h>
diff --git a/lib/accelerated/x86/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
index 3875cfca43..7365f6c0c6 100644
--- a/lib/accelerated/x86/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
@@ -30,7 +30,7 @@
 #include <aes-padlock.h>
 #include <assert.h>
 #include <sha-padlock.h>
-#include <x86.h>
+#include <x86-common.h>
 
 #ifdef HAVE_LIBNETTLE
 
diff --git a/lib/accelerated/x86/sha-x86-ssse3.c b/lib/accelerated/x86/sha-x86-ssse3.c
index 25b347b585..17724f71ce 100644
--- a/lib/accelerated/x86/sha-x86-ssse3.c
+++ b/lib/accelerated/x86/sha-x86-ssse3.c
@@ -29,7 +29,7 @@
 #include <nettle/macros.h>
 #include <nettle/nettle-meta.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 
 void sha1_block_data_order(void *c, const void *p, size_t len);
 void sha256_block_data_order(void *c, const void *p, size_t len);
diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index 1c19a6606a..166cd257a5 100644
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -31,7 +31,7 @@
 #include <gnutls_errors.h>
 #include <aes-x86.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #ifdef HAVE_LIBNETTLE
 # include <nettle/aes.h>		/* for key generation in 192 and 256 bits */
 # include <sha-padlock.h>
diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86-common.h
similarity index 100%
rename from lib/accelerated/x86/x86.h
rename to lib/accelerated/x86/x86-common.h