diff options
| author | rustyx <me@rustyx.org> | 2016-02-02 10:27:18 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-02-20 18:52:53 (GMT) |
| commit | efbee8627873fbcee454319573cdf94816b25824 (patch) | |
| tree | 81a4e994f38540f413fb894729ad6013e45168fb | |
| parent | 7f283980f00f0543e97f46567fbe5bdd4d732724 (diff) | |
| download | jemalloc-efbee8627873fbcee454319573cdf94816b25824.zip jemalloc-efbee8627873fbcee454319573cdf94816b25824.tar.gz jemalloc-efbee8627873fbcee454319573cdf94816b25824.tar.bz2 | |
Prevent MSVC from optimizing away tls_callback (resolves #318)
| -rw-r--r-- | src/tsd.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -148,13 +148,15 @@ _tls_callback(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) #ifdef _MSC_VER # ifdef _M_IX86 # pragma comment(linker, "/INCLUDE:__tls_used") +# pragma comment(linker, "/INCLUDE:_tls_callback") # else # pragma comment(linker, "/INCLUDE:_tls_used") +# pragma comment(linker, "/INCLUDE:tls_callback") # endif # pragma section(".CRT$XLY",long,read) #endif JEMALLOC_SECTION(".CRT$XLY") JEMALLOC_ATTR(used) -static BOOL (WINAPI *const tls_callback)(HINSTANCE hinstDLL, +BOOL (WINAPI *const tls_callback)(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) = _tls_callback; #endif |