From 22bc570fba00c4dd04cb4962e219d4230f137a4c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh@glandium.org>
Date: Wed, 21 May 2014 18:06:14 +0900
Subject: [PATCH] Move __func__ to jemalloc_internal_macros.h

test/integration/aligned_alloc.c needs it.
---
 include/jemalloc/internal/jemalloc_internal.h.in     | 1 -
 include/jemalloc/internal/jemalloc_internal_macros.h | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
index c9462e52..d9bfadf0 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/include/jemalloc/internal/jemalloc_internal.h.in
@@ -46,7 +46,6 @@
 typedef intptr_t ssize_t;
 #  define PATH_MAX 1024
 #  define STDERR_FILENO 2
-#  define __func__ __FUNCTION__
 /* Disable warnings about deprecated system functions */
 #  pragma warning(disable: 4996)
 #else
diff --git a/include/jemalloc/internal/jemalloc_internal_macros.h b/include/jemalloc/internal/jemalloc_internal_macros.h
index 4e239230..bb81e990 100644
--- a/include/jemalloc/internal/jemalloc_internal_macros.h
+++ b/include/jemalloc/internal/jemalloc_internal_macros.h
@@ -49,3 +49,7 @@
 #ifndef JEMALLOC_HAS_RESTRICT
 #  define restrict
 #endif
+
+#ifdef _MSC_VER
+#  define __func__ __FUNCTION__
+#endif