summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2013-10-20 00:20:18 (GMT)
committerJason Evans <jasone@canonware.com>2013-10-20 00:26:00 (GMT)
commit543abf7e6c7de06fe9654e91190b5c44a11b065e (patch)
tree9e0967381c6450a99fbe7d70569c666ff2a4f037 /src
parent3ab682d341f033017d042e8498578c2332eacd69 (diff)
downloadjemalloc-543abf7e6c7de06fe9654e91190b5c44a11b065e.zip
jemalloc-543abf7e6c7de06fe9654e91190b5c44a11b065e.tar.gz
jemalloc-543abf7e6c7de06fe9654e91190b5c44a11b065e.tar.bz2
Fix inlining warning.
Add the JEMALLOC_ALWAYS_INLINE_C macro and use it for always-inlined functions declared in .c files. This fixes a function attribute inconsistency for debug builds that resulted in (harmless) compiler warnings about functions not being inlinable. Reported by Ricardo Nabinger Sanchez.
Diffstat (limited to 'src')
-rw-r--r--src/jemalloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c
index e3991da..ae56db6 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -282,7 +282,7 @@ arenas_cleanup(void *arg)
malloc_mutex_unlock(&arenas_lock);
}
-static JEMALLOC_ATTR(always_inline) void
+JEMALLOC_ALWAYS_INLINE_C void
malloc_thread_init(void)
{
@@ -299,7 +299,7 @@ malloc_thread_init(void)
quarantine_alloc_hook();
}
-static JEMALLOC_ATTR(always_inline) bool
+JEMALLOC_ALWAYS_INLINE_C bool
malloc_init(void)
{
@@ -1402,7 +1402,7 @@ je_mallctlbymib(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
*/
#ifdef JEMALLOC_EXPERIMENTAL
-static JEMALLOC_ATTR(always_inline) void *
+JEMALLOC_ALWAYS_INLINE_C void *
iallocm(size_t usize, size_t alignment, bool zero, bool try_tcache,
arena_t *arena)
{