Move __func__ to jemalloc_internal_macros.h

test/integration/aligned_alloc.c needs it.
2014-05-21 18:06:14 +09:00 · 2014-05-21 18:06:14 +09:00 · 22bc570fba
commit 22bc570fba
parent a9df1ae622
2 changed files with 4 additions and 1 deletions
--- 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
--- 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