From f3bae850688a5b1084d547326d61c33276f3bd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= <jiamengyuan@h-partners.com>
Date: Mon, 28 Oct 2024 06:09:49 +0000
Subject: [PATCH 1/2] =?UTF-8?q?update=20frameworks/libhilog/base/hilog=5Fb?=
 =?UTF-8?q?ase.c.=20=E7=A4=BE=E5=8C=BA=E9=97=A8=E7=A6=81sdk=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=A7=84=E9=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 贾孟元 <jiamengyuan@h-partners.com>
---
 frameworks/libhilog/base/hilog_base.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frameworks/libhilog/base/hilog_base.c b/frameworks/libhilog/base/hilog_base.c
index c482e9c..5a28353 100644
--- a/frameworks/libhilog/base/hilog_base.c
+++ b/frameworks/libhilog/base/hilog_base.c
@@ -25,6 +25,8 @@
 #include <sys/un.h>
 #include <time.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
 
 #define LOG_LEN 3
 #define ERROR_FD 2
@@ -76,6 +78,10 @@ static int SendMessage(HilogMsg *header, const char *tag, uint16_t tagLen, const
     return ret;
 }
 
+pid_t gettid(void) {
+    return (pid_t)syscall(SYS_gettid);
+}
+
 int HiLogBasePrintArgs(
     const LogType type, const LogLevel level, const unsigned int domain, const char *tag, const char *fmt, va_list ap)
 {
-- 
Gitee


From d4a85082cb9e10534d3fe69f2be630ab6e3c52f7 Mon Sep 17 00:00:00 2001
From: oh_ci <maguangsheng1@huawei.com>
Date: Mon, 28 Oct 2024 07:14:35 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!589?=
 =?UTF-8?q?=20:=20=E7=A4=BE=E5=8C=BAsdk=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=A7=84=E9=81=BF2'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frameworks/libhilog/base/hilog_base.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frameworks/libhilog/base/hilog_base.c b/frameworks/libhilog/base/hilog_base.c
index 5a28353..c482e9c 100644
--- a/frameworks/libhilog/base/hilog_base.c
+++ b/frameworks/libhilog/base/hilog_base.c
@@ -25,8 +25,6 @@
 #include <sys/un.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
 
 #define LOG_LEN 3
 #define ERROR_FD 2
@@ -78,10 +76,6 @@ static int SendMessage(HilogMsg *header, const char *tag, uint16_t tagLen, const
     return ret;
 }
 
-pid_t gettid(void) {
-    return (pid_t)syscall(SYS_gettid);
-}
-
 int HiLogBasePrintArgs(
     const LogType type, const LogLevel level, const unsigned int domain, const char *tag, const char *fmt, va_list ap)
 {
-- 
Gitee