From 8d80c3e5ec08eb9d4203106932b16efffa36fb26 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 14 Apr 2019 19:13:17 +0000 Subject: Declare the tls model in external declarations. Pointed out by joerg. --- .../jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h | 4 ++-- external/bsd/jemalloc/include/jemalloc/internal/tsd_tls.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'external/bsd/jemalloc/include') diff --git a/external/bsd/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h b/external/bsd/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h index beb467a67e9..9bc2a8aed9b 100644 --- a/external/bsd/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h +++ b/external/bsd/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h @@ -3,8 +3,8 @@ #endif #define JEMALLOC_INTERNAL_TSD_MALLOC_THREAD_CLEANUP_H -extern __thread tsd_t tsd_tls; -extern __thread bool tsd_initialized; +extern __thread tsd_t JEMALLOC_TLS_MODEL tsd_tls; +extern __thread bool JEMALLOC_TLS_MODEL tsd_initialized; extern bool tsd_booted; /* Initialization/cleanup. */ diff --git a/external/bsd/jemalloc/include/jemalloc/internal/tsd_tls.h b/external/bsd/jemalloc/include/jemalloc/internal/tsd_tls.h index 0de64b7b8bf..11338cf0d22 100644 --- a/external/bsd/jemalloc/include/jemalloc/internal/tsd_tls.h +++ b/external/bsd/jemalloc/include/jemalloc/internal/tsd_tls.h @@ -3,7 +3,7 @@ #endif #define JEMALLOC_INTERNAL_TSD_TLS_H -extern __thread tsd_t tsd_tls; +extern __thread tsd_t JEMALLOC_TLS_MODEL tsd_tls; extern pthread_key_t tsd_tsd; extern bool tsd_booted; -- cgit