From 279f465fd32017b325a0d72bdbdefc7c53ae9ea2 Mon Sep 17 00:00:00 2001
From: jasone <jasone@FreeBSD.org>
Date: Tue, 17 Apr 2012 22:05:55 +0000
Subject: Import jemalloc b57d3ec571c6551231be62b7bf92c084a8c8291c (dev branch,
 prior to 3.0.0 release), which supports atomic operations based on atomic(9).
 This should fix build failures for several platforms.

---
 contrib/jemalloc/FREEBSD-diffs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'contrib/jemalloc/FREEBSD-diffs')

diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index 927268c..d87d0fc 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -45,17 +45,19 @@ index 98d0ba4..23d2152 100644
 +  </refsect1>
  </refentry>
 diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
-index aa21aa5..e0f5fed 100644
+index 905653a..b235a0d 100644
 --- a/include/jemalloc/internal/jemalloc_internal.h.in
 +++ b/include/jemalloc/internal/jemalloc_internal.h.in
-@@ -1,3 +1,6 @@
+@@ -1,5 +1,8 @@
+ #ifndef JEMALLOC_INTERNAL_H
+ #define JEMALLOC_INTERNAL_H
 +#include "libc_private.h"
 +#include "namespace.h"
 +
  #include <sys/mman.h>
  #include <sys/param.h>
  #include <sys/syscall.h>
-@@ -33,6 +36,9 @@
+@@ -35,6 +38,9 @@
  #include <pthread.h>
  #include <math.h>
  
-- 
cgit v1.1