diff options
| author | wchang kim <wchang.kim@samsung.com> | 2023-07-03 09:36:09 +0900 |
|---|---|---|
| committer | wchang kim <wchang.kim@samsung.com> | 2023-07-03 09:36:09 +0900 |
| commit | a2722b2e762dcad826d147b4756d9f9d9bb236af (patch) | |
| tree | dc1478052a10c618189b19946855c3f5ca29ffad | |
| parent | 56861c11f2f045343014b155faea0ac911b02e07 (diff) | |
| download | msg-service-tizen.tar.gz msg-service-tizen.tar.bz2 msg-service-tizen.zip | |
Fixed the build error using gcc 13HEADaccepted/tizen/unified/dev/20230726.120024accepted/tizen/unified/20231226.180251accepted/tizen/unified/20231226.154720tizenaccepted/tizen_unified_devaccepted/tizen_unified
Change-Id: Iafe4cb64230b1ae5703755c5ebea6a7974528cd3
| -rwxr-xr-x | utils/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | utils/MsgTextConvert.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 32c10c9..87d6288 100755 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -54,6 +54,7 @@ ENDFOREACH(flag) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DFEATURE_JAVA_MMS") +ADD_DEFINITIONS("-Wno-stringop-truncation") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}") diff --git a/utils/MsgTextConvert.cpp b/utils/MsgTextConvert.cpp index 57edce3..5a276b8 100755 --- a/utils/MsgTextConvert.cpp +++ b/utils/MsgTextConvert.cpp @@ -498,7 +498,7 @@ int MsgTextConvert::convertUTF8ToUCS2(OUT unsigned char *pDestText, IN int maxLe cd = g_iconv_open("UTF16BE", "UTF8"); - if (cd > 0) { + if (cd != (GIConv)-1) { err = g_iconv(cd, (char**)&pSrcText, (gsize*)&textLen, (char**)&unicodeTemp, (gsize*)&remainedBuffer); } @@ -641,7 +641,7 @@ int MsgTextConvert::convertUCS2ToUTF8(OUT unsigned char *pDestText, IN int maxLe cd = g_iconv_open("UTF8", "UTF16BE"); - if (cd > 0) { + if (cd != (GIConv)-1) { err = g_iconv(cd, (char**)&pSrcText, (gsize*)&textLen, (char**)&pDestText, (gsize*)&remainedBuffer); } @@ -692,7 +692,7 @@ int MsgTextConvert::convertEUCKRToUTF8(OUT unsigned char *pDestText, IN int maxL cd = g_iconv_open("UTF8", "EUCKR"); - if (cd > 0) { + if (cd != (GIConv)-1) { err = g_iconv(cd, (char**)&pSrcText, (gsize*)&textLen, (char**)&pDestText, (gsize*)&remainedBuffer); } @@ -742,7 +742,7 @@ int MsgTextConvert::convertSHIFTJISToUTF8(OUT unsigned char *pDestText, IN int m cd = g_iconv_open("UTF8", "SHIFT-JIS"); - if (cd > 0) { + if (cd != (GIConv)-1) { err = g_iconv(cd, (char**)&pSrcText, (gsize*)&textLen, (char**)&pDestText, (gsize*)&remainedBuffer); } |