From 3b5ee5e8574e0599a5bdcd05e3b72160b8379355 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Thu, 11 Feb 2010 15:56:23 -0800 Subject: [PATCH] Fix #include ordering for mb.h. Include mb.h after mutex.h, in case it actually has to use the mutex-based memory barrier implementation. --- jemalloc/include/jemalloc/internal/jemalloc_internal.h.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in b/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in index f7721f84..df1829f7 100644 --- a/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in +++ b/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in @@ -170,11 +170,11 @@ extern void (*JEMALLOC_P(malloc_message))(void *w4opaque, const char *p1, (((s) + PAGE_MASK) & ~PAGE_MASK) #include "jemalloc/internal/prn.h" -#include "jemalloc/internal/mb.h" #include "jemalloc/internal/ckh.h" #include "jemalloc/internal/stats.h" #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/mutex.h" +#include "jemalloc/internal/mb.h" #include "jemalloc/internal/extent.h" #include "jemalloc/internal/arena.h" #include "jemalloc/internal/base.h" @@ -189,11 +189,11 @@ extern void (*JEMALLOC_P(malloc_message))(void *w4opaque, const char *p1, #define JEMALLOC_H_STRUCTS #include "jemalloc/internal/prn.h" -#include "jemalloc/internal/mb.h" #include "jemalloc/internal/ckh.h" #include "jemalloc/internal/stats.h" #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/mutex.h" +#include "jemalloc/internal/mb.h" #include "jemalloc/internal/extent.h" #include "jemalloc/internal/arena.h" #include "jemalloc/internal/base.h" @@ -251,11 +251,11 @@ arena_t *choose_arena_hard(void); #endif #include "jemalloc/internal/prn.h" -#include "jemalloc/internal/mb.h" #include "jemalloc/internal/ckh.h" #include "jemalloc/internal/stats.h" #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/mutex.h" +#include "jemalloc/internal/mb.h" #include "jemalloc/internal/extent.h" #include "jemalloc/internal/arena.h" #include "jemalloc/internal/base.h" @@ -270,11 +270,11 @@ arena_t *choose_arena_hard(void); #define JEMALLOC_H_INLINES #include "jemalloc/internal/prn.h" -#include "jemalloc/internal/mb.h" #include "jemalloc/internal/ckh.h" #include "jemalloc/internal/stats.h" #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/mutex.h" +#include "jemalloc/internal/mb.h" #include "jemalloc/internal/extent.h" #include "jemalloc/internal/base.h" #include "jemalloc/internal/chunk.h"