luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 05:43:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

gconstructorprivate.h: Add seamless support for C++

Browse Source 
G_DEFINE_TLS_CALLBACK could be made public in the future
This commit is contained in:
Luca Bacci 2023-09-01 11:20:21 +02:00
parent f916621d72
commit 0bbe3c8447
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gconstructorprivate.h
View File

@ -25,6 +25,16 @@
#ifdef _WIN32 #ifdef _WIN32
#ifdef __cplusplus
/* const defaults to static (internal visibility) in C++,
* but we want extern instead */
#define G_EXTERN_CONST extern const
#else
/* Using extern const in C is perfectly valid, but triggers
* a warning in GCC and CLANG, therefore we avoid it */
#define G_EXTERN_CONST const
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#define G_HAS_TLS_CALLBACKS 1 #define G_HAS_TLS_CALLBACKS 1
@ -34,8 +44,10 @@ __pragma (section (".CRT$XLCE", long, read)) \
\ \
static void NTAPI func (PVOID, DWORD, PVOID); \ static void NTAPI func (PVOID, DWORD, PVOID); \
\ \
G_BEGIN_DECLS \
__declspec (allocate (".CRT$XLCE")) \ __declspec (allocate (".CRT$XLCE")) \
const PIMAGE_TLS_CALLBACK _ptr_##func = func; \ G_EXTERN_CONST PIMAGE_TLS_CALLBACK _ptr_##func = func; \
G_END_DECLS \
\ \
__pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_tls_used")) \ __pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_tls_used")) \
__pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_ptr_" #func)) __pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_ptr_" #func))
@ -47,8 +59,10 @@ __pragma (comment (linker, "/INCLUDE:" G_MSVC_SYMBOL_PREFIX "_ptr_" #func))
#define G_DEFINE_TLS_CALLBACK(func) \ #define G_DEFINE_TLS_CALLBACK(func) \
static void NTAPI func (PVOID, DWORD, PVOID); \ static void NTAPI func (PVOID, DWORD, PVOID); \
\ \
__attribute__((section(".CRT$XLCE"))) \ G_BEGIN_DECLS \
const PIMAGE_TLS_CALLBACK _ptr_##func = func; __attribute__ ((section (".CRT$XLCE"))) \
G_EXTERN_CONST PIMAGE_TLS_CALLBACK _ptr_##func = func; \
G_END_DECLS
#endif /* _MSC_VER */ #endif /* _MSC_VER */