From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 5 Dec 2012 15:21:54 +0000 (+0200)
Subject: test: Fix re-declaration of "encrypt" symbol
X-Git-Tag: android-x86-4.4-r3~10466
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05bad2b9f761d514a71596adb25a3119bbb35110;p=android-x86%2Fexternal-bluetooth-bluez.git

test: Fix re-declaration of "encrypt" symbol

test/l2test.c:106:12: error: ‘encrypt’ redeclared as different kind of symbol
In file included from test/l2test.c:30:0:
/usr/include/unistd.h:1147:13: note: previous declaration of ‘encrypt’ was here
---

diff --git a/test/l2test.c b/test/l2test.c
index c5b6efe33..7f9f00706 100644
--- a/test/l2test.c
+++ b/test/l2test.c
@@ -103,7 +103,7 @@ static char *filename = NULL;
 static int rfcmode = 0;
 static int master = 0;
 static int auth = 0;
-static int encrypt = 0;
+static int encr = 0;
 static int secure = 0;
 static int socktype = SOCK_SEQPACKET;
 static int linger = 0;
@@ -336,7 +336,7 @@ static int do_connect(char *svr)
 		opt |= L2CAP_LM_MASTER;
 	if (auth)
 		opt |= L2CAP_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= L2CAP_LM_ENCRYPT;
 	if (secure)
 		opt |= L2CAP_LM_SECURE;
@@ -471,7 +471,7 @@ static void do_listen(void (*handler)(int sk))
 		opt |= L2CAP_LM_MASTER;
 	if (auth)
 		opt |= L2CAP_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= L2CAP_LM_ENCRYPT;
 	if (secure)
 		opt |= L2CAP_LM_SECURE;
@@ -1404,7 +1404,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'E':
-			encrypt = 1;
+			encr = 1;
 			break;
 
 		case 'S':
diff --git a/test/rctest.c b/test/rctest.c
index 417cb3f49..58aa533c5 100644
--- a/test/rctest.c
+++ b/test/rctest.c
@@ -80,7 +80,7 @@ static int save_fd = -1;
 
 static int master = 0;
 static int auth = 0;
-static int encrypt = 0;
+static int encr = 0;
 static int secure = 0;
 static int socktype = SOCK_STREAM;
 static int linger = 0;
@@ -205,7 +205,7 @@ static int do_connect(const char *svr)
 		opt |= RFCOMM_LM_MASTER;
 	if (auth)
 		opt |= RFCOMM_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= RFCOMM_LM_ENCRYPT;
 	if (secure)
 		opt |= RFCOMM_LM_SECURE;
@@ -296,7 +296,7 @@ static void do_listen(void (*handler)(int sk))
 		opt |= RFCOMM_LM_MASTER;
 	if (auth)
 		opt |= RFCOMM_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= RFCOMM_LM_ENCRYPT;
 	if (secure)
 		opt |= RFCOMM_LM_SECURE;
@@ -776,7 +776,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'E':
-			encrypt = 1;
+			encr = 1;
 			break;
 
 		case 'S':