From 8bfe9f711612efde96a0d7b7aa3ba7178ab51640 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 20 二月 2021 15:10:11 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 include/usgcommon/usg_common.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/usgcommon/usg_common.h b/include/usgcommon/usg_common.h
index 08d4885..ba90002 100644
--- a/include/usgcommon/usg_common.h
+++ b/include/usgcommon/usg_common.h
@@ -101,7 +101,7 @@
 /**
  * @ seperator 鍒嗗壊绗�
  */
-char * str_join( const char *seperator, const char *first...);
+char * str_join( const char *seperator, const char *first, ...);
 /**
  * 鎶婂瓧绗︿覆浠delim鍒嗗壊涓烘暟缁勶紝鏁扮粍鐨勫湴鍧�瀛樻斁鍦ˊarr_addr
  */

--
Gitblit v1.8.0