[PATCH] Move __func__ to jemalloc_internal_macros.h
Mike Hommey
mh+jemalloc at glandium.org
Wed May 21 02:06:14 PDT 2014
From: Mike Hommey <mh at glandium.org>
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 c9462e5..d9bfadf 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 4e23923..bb81e99 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
--
2.0.0.rc2
More information about the jemalloc-discuss
mailing list