From 8b7b856ca3c2d94361a2bc9e2711d9b70e9c4011 Mon Sep 17 00:00:00 2001
From: arvinzzz <zhaotianyu9@huawei.com>
Date: Wed, 7 Dec 2022 15:50:15 +0800
Subject: [PATCH] fixed 3859d66 from
 https://gitee.com/arvinzzz/third_party_musl/pulls/734 fix: compiler fault
 with iccarm

Signed-off-by: arvinzzz <zhaotianyu9@huawei.com>
Change-Id: Ia2ebd7e498ffaecbbba8e64adb5e0822e6cdf863
---
 porting/liteos_a/kernel/include/pthread.h        | 2 +-
 porting/liteos_m/kernel/include/pthread.h        | 4 ++--
 porting/liteos_m/user/include/pthread.h          | 6 +++---
 porting/liteos_m_iccarm/kernel/include/pthread.h | 4 ++--
 porting/uniproton/kernel/include/pthread.h       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/porting/liteos_a/kernel/include/pthread.h b/porting/liteos_a/kernel/include/pthread.h
index 87fd0879..6163f798 100644
--- a/porting/liteos_a/kernel/include/pthread.h
+++ b/porting/liteos_a/kernel/include/pthread.h
@@ -127,7 +127,7 @@ typedef struct pthread_cond {
      { (struct LOS_DL_LIST *)NULL, (struct LOS_DL_LIST *)NULL }, \
      (VOID *)NULL, 0 }
 #endif
-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
+#define PTHREAD_RWLOCK_INITIALIZER {0}
 #define PTHREAD_COND_INITIALIZER { -1, { 0, { NULL, NULL } } , NULL, -1 }
 #define PTHREAD_ONCE_INIT 0
 
diff --git a/porting/liteos_m/kernel/include/pthread.h b/porting/liteos_m/kernel/include/pthread.h
index a951f63f..f9fffaa2 100644
--- a/porting/liteos_m/kernel/include/pthread.h
+++ b/porting/liteos_m/kernel/include/pthread.h
@@ -62,8 +62,8 @@ extern "C" {
 #ifdef _GNU_SOURCE
 #define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { _MUX_MAGIC, _MUX_INVALID_HANDLE, PTHREAD_MUTEXATTR_INITIALIZER }
 #endif
-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
-#define PTHREAD_COND_INITIALIZER {{{0}}}
+#define PTHREAD_RWLOCK_INITIALIZER {0}
+#define PTHREAD_COND_INITIALIZER {0}
 #define PTHREAD_ONCE_INIT 0
 
 
diff --git a/porting/liteos_m/user/include/pthread.h b/porting/liteos_m/user/include/pthread.h
index 984db680..176d42b6 100644
--- a/porting/liteos_m/user/include/pthread.h
+++ b/porting/liteos_m/user/include/pthread.h
@@ -55,9 +55,9 @@ extern "C" {
 #define PTHREAD_PROCESS_SHARED 1
 
 
-#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
-#define PTHREAD_COND_INITIALIZER {{{0}}}
+#define PTHREAD_MUTEX_INITIALIZER {0}
+#define PTHREAD_RWLOCK_INITIALIZER {0}
+#define PTHREAD_COND_INITIALIZER {0}
 #define PTHREAD_ONCE_INIT 0
 
 
diff --git a/porting/liteos_m_iccarm/kernel/include/pthread.h b/porting/liteos_m_iccarm/kernel/include/pthread.h
index a951f63f..f9fffaa2 100644
--- a/porting/liteos_m_iccarm/kernel/include/pthread.h
+++ b/porting/liteos_m_iccarm/kernel/include/pthread.h
@@ -62,8 +62,8 @@ extern "C" {
 #ifdef _GNU_SOURCE
 #define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { _MUX_MAGIC, _MUX_INVALID_HANDLE, PTHREAD_MUTEXATTR_INITIALIZER }
 #endif
-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
-#define PTHREAD_COND_INITIALIZER {{{0}}}
+#define PTHREAD_RWLOCK_INITIALIZER {0}
+#define PTHREAD_COND_INITIALIZER {0}
 #define PTHREAD_ONCE_INIT 0
 
 
diff --git a/porting/uniproton/kernel/include/pthread.h b/porting/uniproton/kernel/include/pthread.h
index a951f63f..f9fffaa2 100644
--- a/porting/uniproton/kernel/include/pthread.h
+++ b/porting/uniproton/kernel/include/pthread.h
@@ -62,8 +62,8 @@ extern "C" {
 #ifdef _GNU_SOURCE
 #define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { _MUX_MAGIC, _MUX_INVALID_HANDLE, PTHREAD_MUTEXATTR_INITIALIZER }
 #endif
-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
-#define PTHREAD_COND_INITIALIZER {{{0}}}
+#define PTHREAD_RWLOCK_INITIALIZER {0}
+#define PTHREAD_COND_INITIALIZER {0}
 #define PTHREAD_ONCE_INIT 0
 
 
-- 
GitLab