From 516a70c7ebce5385ce9332d108f7706d5dc1a0b6 Mon Sep 17 00:00:00 2001
From: lijiawei <lijiawei49@huawei.com>
Date: Wed, 13 Jul 2022 18:54:00 +0800
Subject: [PATCH] IWYU fix

Signed-off-by: lijiawei <lijiawei49@huawei.com>
---
 libpurgeablemem/c/include/purgeable_mem_c.h      | 4 ++--
 libpurgeablemem/c/src/purgeable_mem_builder_c.c  | 2 +-
 libpurgeablemem/c/src/purgeable_mem_c.c          | 2 --
 libpurgeablemem/common/include/pm_ptr_util.h     | 2 +-
 libpurgeablemem/common/include/ux_page_table_c.h | 2 +-
 libpurgeablemem/common/src/ux_page_table_c.c     | 2 +-
 libpurgeablemem/cpp/include/ux_page_table.h      | 4 ++--
 libpurgeablemem/cpp/src/ux_page_table.cpp        | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libpurgeablemem/c/include/purgeable_mem_c.h b/libpurgeablemem/c/include/purgeable_mem_c.h
index 14268c3..3628ac7 100644
--- a/libpurgeablemem/c/include/purgeable_mem_c.h
+++ b/libpurgeablemem/c/include/purgeable_mem_c.h
@@ -16,8 +16,8 @@
 #ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H
 #define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H
 
-#include <stdbool.h>
-#include <sys/types.h> /* size_t */
+#include <stdbool.h> /* bool */
+#include <stddef.h> /* size_t */
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/libpurgeablemem/c/src/purgeable_mem_builder_c.c b/libpurgeablemem/c/src/purgeable_mem_builder_c.c
index e0faf23..714b4d0 100644
--- a/libpurgeablemem/c/src/purgeable_mem_builder_c.c
+++ b/libpurgeablemem/c/src/purgeable_mem_builder_c.c
@@ -17,7 +17,7 @@
 #include <stddef.h> /* NULL */
 #include <stdlib.h> /* malloc */
 
-#include "hilog/log.h"
+#include "hilog/log_c.h"
 #include "../../common/include/pm_ptr_util.h"
 #include "purgeable_mem_builder_c.h"
 
diff --git a/libpurgeablemem/c/src/purgeable_mem_c.c b/libpurgeablemem/c/src/purgeable_mem_c.c
index 88973a0..c178977 100644
--- a/libpurgeablemem/c/src/purgeable_mem_c.c
+++ b/libpurgeablemem/c/src/purgeable_mem_c.c
@@ -13,12 +13,10 @@
  * limitations under the License.
  */
 
-#include <sys/types.h> /* size_t */
 #include <stdlib.h> /* malloc */
 #include <sys/mman.h> /* mmap */
 #include <pthread.h>
 #include <stdio.h> /* FILE */
-#include <stdatomic.h>
 
 #include "securec.h"
 #include "../../common/include/pm_ptr_util.h"
diff --git a/libpurgeablemem/common/include/pm_ptr_util.h b/libpurgeablemem/common/include/pm_ptr_util.h
index 8d4ab84..75d7f76 100644
--- a/libpurgeablemem/common/include/pm_ptr_util.h
+++ b/libpurgeablemem/common/include/pm_ptr_util.h
@@ -16,7 +16,7 @@
 #ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H
 #define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H
 
-#include "hilog/log.h"
+#include "hilog/log_c.h"
 
 #define IF_NULL_LOG_ACTION(pointer, log, action)       \
     do {                                               \
diff --git a/libpurgeablemem/common/include/ux_page_table_c.h b/libpurgeablemem/common/include/ux_page_table_c.h
index 5a5a21a..cbfdc1d 100644
--- a/libpurgeablemem/common/include/ux_page_table_c.h
+++ b/libpurgeablemem/common/include/ux_page_table_c.h
@@ -18,7 +18,7 @@
 
 #include <stdint.h> /* uint64_t */
 #include <stdbool.h> /* bool */
-#include <sys/types.h> /* size_t */
+#include <stddef.h> /* size_t */
 #include "pm_state_c.h"
 
 #ifdef __cplusplus
diff --git a/libpurgeablemem/common/src/ux_page_table_c.c b/libpurgeablemem/common/src/ux_page_table_c.c
index efe403e..ed9674b 100644
--- a/libpurgeablemem/common/src/ux_page_table_c.c
+++ b/libpurgeablemem/common/src/ux_page_table_c.c
@@ -17,7 +17,7 @@
 #include <sys/mman.h> /* mmap */
 #include <sched.h> /* sched_yield() */
 
-#include "hilog/log.h"
+#include "hilog/log_c.h"
 #include "pm_util.h"
 #include "ux_page_table_c.h"
 
diff --git a/libpurgeablemem/cpp/include/ux_page_table.h b/libpurgeablemem/cpp/include/ux_page_table.h
index e84d6a9..301640a 100644
--- a/libpurgeablemem/cpp/include/ux_page_table.h
+++ b/libpurgeablemem/cpp/include/ux_page_table.h
@@ -16,9 +16,9 @@
 #ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H
 #define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H
 
-#include <string>
+#include <string> /* std::string */
 
-#include "../../common/include/ux_page_table_c.h"
+#include "../../common/include/ux_page_table_c.h" /* UxPageTableStruct */
 
 namespace OHOS {
 namespace PurgeableMem {
diff --git a/libpurgeablemem/cpp/src/ux_page_table.cpp b/libpurgeablemem/cpp/src/ux_page_table.cpp
index fe4d03d..d3727e4 100644
--- a/libpurgeablemem/cpp/src/ux_page_table.cpp
+++ b/libpurgeablemem/cpp/src/ux_page_table.cpp
@@ -15,7 +15,7 @@
 
 #include <cstdlib> /* malloc */
 
-#include "pm_smartptr_util.h"
+#include "hilog/log_c.h"
 #include "ux_page_table.h"
 
 namespace OHOS {
-- 
Gitee