mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

simplify the use of *nix symbol exports

Browse Source 
It is generally never wrong to avoid setting the symbol visibility to
default for public symbols. It is already checked for compilers that
actually support the attribute.

The visibility define merely tells the compiler that the symbol is
semantically an interface symbol. This is already the default for all
symbols. The real purpose of the attribute is simply to override
-fvisibility passed on the command line.

On *nix, you can set visibility for both shared and static libraries
without harm anyway.

Despite this, respect the "hidden symbols" option. There's no actual use
for creating a shared library without symbols, and it's essentially a
no-op for static libraries, but in the static library case one might be
including cJSON into another shared library, and not want to expose the
cJSON symbols.

Therefore, make the header *directly* respect this option, rather than
conditionalizing it on the CMakeLists.txt both setting the hidden
symbols define *and* undefining the visibility define.
This commit is contained in:
Eli Schwartz 2022-06-30 23:41:34 -04:00
parent b45f48e600
commit bfbed6434d
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -88,11 +88,11 @@ endif()
option(ENABLE_PUBLIC_SYMBOLS "Export library symbols." On)
if (ENABLE_PUBLIC_SYMBOLS)
list(APPEND custom_compiler_flags -fvisibility=hidden)
add_definitions(-DCJSON_EXPORT_SYMBOLS -DCJSON_API_VISIBILITY)
add_definitions(-DCJSON_EXPORT_SYMBOLS)
endif()
option(ENABLE_HIDDEN_SYMBOLS "Hide library symbols." Off)
if (ENABLE_HIDDEN_SYMBOLS)
add_definitions(-DCJSON_HIDE_SYMBOLS -UCJSON_API_VISIBILITY)
add_definitions(-DCJSON_HIDE_SYMBOLS)
endif()
# apply custom compiler flags

4
cJSON.h
View File

@ -48,8 +48,6 @@ or
-xldscope=hidden (for sun cc)
to CFLAGS
then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
*/
#define CJSON_CDECL __cdecl
@ -71,7 +69,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
#define CJSON_CDECL
#define CJSON_STDCALL
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && !defined(CJSON_HIDE_SYMBOLS)
#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type
#else
#define CJSON_PUBLIC(type) type