Conversation
|
Could you add the CI changes and the |
fa889b9 to
51441d8
Compare
|
@arnaud-lb done |
TSRM/TSRM.h
Outdated
| #if defined(__cplusplus) && defined(__clang__) | ||
| #define TSRMLS_MAIN_CACHE_EXTERN() extern "C" { extern TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR; } | ||
| #define TSRMLS_CACHE_EXTERN() extern "C" { extern TSRM_TLS void *TSRMLS_CACHE; } | ||
| #else | ||
| #define TSRMLS_MAIN_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR; |
There was a problem hiding this comment.
seems silly because it's already in an extern "C" block above, but intl fails to compile because it sees _tsrm_ls_cache as both C and C++ named symbol
some macro resolution weirdness that this works around
There was a problem hiding this comment.
Oh I see it now, extern "C" has no effect on symbols declared by these macros
There was a problem hiding this comment.
ah right! it's fine either way, extern "C" { extern "C" { } } is perfectly valid. removed the if clang
arnaud-lb
left a comment
There was a problem hiding this comment.
This looks right to me, but maybe others can take a look? cc @cmb69 @shivammathur @TimWolla
|
@henderkes I think that the |
|
Ah yeah, it's technically not necessary, just bloats the logs a lot. I'll add it in. |
No description provided.