organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-22576 Use standard alignof() with modern C.

Browse source
This commit is contained in:
Fredrik Roubert 2023-11-30 20:07:03 +01:00 • committed by Fredrik Roubert
parent 1bc059e7d6
commit e112f896a2
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.ci-builds/.azure-pipelines.yml
View file

@ -164,7 +164,7 @@ jobs:
displayName: 'Build only (WarningsAsErrors)'
env:
CC: clang-16
CPPFLAGS: '-Werror -Wno-strict-prototypes -Wno-gnu-offsetof-extensions -Wall -Wextra -Wextra-semi -Wundef -Wnon-virtual-dtor -Wsuggest-override'
CPPFLAGS: '-Werror -Wno-strict-prototypes -Wall -Wextra -Wextra-semi -Wundef -Wnon-virtual-dtor -Wsuggest-override'
CXX: clang++-16
#-------------------------------------------------------------------------
- job: ICU4C_Clang16_Cpp20_Ubuntu_2004
@ -188,7 +188,7 @@ jobs:
displayName: 'Build and Test'
env:
CC: clang-16
CPPFLAGS: '-Werror -Wno-strict-prototypes -Wno-gnu-offsetof-extensions'
CPPFLAGS: '-Werror -Wno-strict-prototypes'
CXX: clang++-16
CXXFLAGS: '-std=c++20'
#-------------------------------------------------------------------------
@ -213,7 +213,7 @@ jobs:
displayName: 'Build and Test'
env:
CC: clang-16
CPPFLAGS: '-Werror -Wno-strict-prototypes -Wno-gnu-offsetof-extensions'
CPPFLAGS: '-Werror -Wno-strict-prototypes'
CXX: clang++-16
CXXFLAGS: '-std=c++20 -stdlib=libc++'
#-------------------------------------------------------------------------

9
icu4c/source/test/cintltst/ccapitst.c
View file

@ -37,8 +37,11 @@
#define MAX_FILE_LEN 1024*20
#define UCS_FILE_NAME_SIZE 512
/* Similar to C++ alignof(type) */
#define ALIGNOF(type) offsetof (struct { char c; type member; }, member)
#if __STDC_VERSION__ < 201112
# define alignof(type) offsetof (struct { char c; type member; }, member)
#elif __STDC_VERSION__ < 202311
# include <stdalign.h>
#endif
/*returns an action other than the one provided*/
#if !UCONFIG_NO_LEGACY_CONVERSION
@ -1837,7 +1840,7 @@ static void TestConvertSafeClone()
/* close the original immediately to make sure that the clone works by itself */
ucnv_close(cnv);
if( actualSizes[idx] <= (bufferSizes[j] - (int32_t)ALIGNOF(UConverter)) &&
if( actualSizes[idx] <= (bufferSizes[j] - (int32_t)alignof(UConverter)) &&
err == U_SAFECLONE_ALLOCATED_WARNING
) {
log_err("ucnv_safeClone(%s) did a heap clone although the buffer was large enough\n", names[idx]);