lkml.org 
[lkml]   [2020]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 09/13] selftests: android: fix multiple definition of sock_name
Date
Fix multiple definition of sock_name compilation error:

tools/testing/selftests/android/ion/ipcsocket.h:8: multiple definition of `sock_name'

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
tools/testing/selftests/android/ion/ipcsocket.c | 1 +
tools/testing/selftests/android/ion/ipcsocket.h | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/testing/selftests/android/ion/ipcsocket.c b/tools/testing/selftests/android/ion/ipcsocket.c
index 7dc521002095..67ec69410d2e 100644
--- a/tools/testing/selftests/android/ion/ipcsocket.c
+++ b/tools/testing/selftests/android/ion/ipcsocket.c
@@ -10,6 +10,7 @@

#include "ipcsocket.h"

+static char sock_name[MAX_SOCK_NAME_LEN];

int opensocket(int *sockfd, const char *name, int connecttype)
{
diff --git a/tools/testing/selftests/android/ion/ipcsocket.h b/tools/testing/selftests/android/ion/ipcsocket.h
index b3e84498a8a1..ec5efb23e7b0 100644
--- a/tools/testing/selftests/android/ion/ipcsocket.h
+++ b/tools/testing/selftests/android/ion/ipcsocket.h
@@ -5,8 +5,6 @@

#define MAX_SOCK_NAME_LEN 64

-char sock_name[MAX_SOCK_NAME_LEN];
-
/* This structure is responsible for holding the IPC data
* data: hold the buffer fd
* len: just the length of 32-bit integer fd
--
2.26.2
\
 
 \ /
  Last update: 2020-10-08 14:28    [W:0.173 / U:2.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site