From 7ad13271e4042d08b425f687e3db4c367dc69645 Mon Sep 17 00:00:00 2001
From: Dariusz Michaluk <d.michaluk@samsung.com>
Date: Mon, 21 Dec 2020 11:08:18 +0100
Subject: [PATCH] Cleanup attr/xattr.h usage.

After attr package upgrade, attr/xattr.h has ben removed,
sys/xattr.h should be used instead.

To fix build break, unnecessary attr/xattr.h usage has ben removed
or changed to proper one.

Change-Id: I5a5acfd9f65e60975a1c28d0231d1bc035e99044
---
 src/security-manager-tests/test_cases.cpp                 | 4 +---
 src/security-manager-tests/test_cases_private_sharing.cpp | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/security-manager-tests/test_cases.cpp b/src/security-manager-tests/test_cases.cpp
index 93d6cea..82d5dd4 100644
--- a/src/security-manager-tests/test_cases.cpp
+++ b/src/security-manager-tests/test_cases.cpp
@@ -14,9 +14,7 @@
  *    limitations under the License.
  */
 
-// cstdlibg has to be included before attr/xattr
-#include <cstdlib>
-#include <attr/xattr.h>
+#include <linux/xattr.h>
 #include <fstream>
 #include <memory>
 #include <regex>
diff --git a/src/security-manager-tests/test_cases_private_sharing.cpp b/src/security-manager-tests/test_cases_private_sharing.cpp
index 4f99eba..9cfce8a 100644
--- a/src/security-manager-tests/test_cases_private_sharing.cpp
+++ b/src/security-manager-tests/test_cases_private_sharing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016-2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -14,10 +14,6 @@
  *    limitations under the License.
  */
 
-// This has to be before xattr header, because it uses size_t and ssize_t and does not include this
-// I hate you, xattr
-#include <sys/types.h>
-#include <attr/xattr.h>
 #include <ftw.h>
 #include <string>
 #include <sys/smack.h>
-- 
2.7.4