aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrustyx <me@rustyx.org>2018-01-19 16:28:33 +0100
committerDavid Goldblatt <davidtgoldblatt@gmail.com>2018-01-30 13:11:41 -0800
commit83aa9880b706ab185aa84f2bf6057477efdd5fd6 (patch)
tree9b2e979c2b4c56b324ebca315dbe120a48339da9 /include
parented52d24f740ddf42b78c59ad0fdc8cd0ffe5c376 (diff)
downloadplatform_external_jemalloc_new-83aa9880b706ab185aa84f2bf6057477efdd5fd6.tar.gz
platform_external_jemalloc_new-83aa9880b706ab185aa84f2bf6057477efdd5fd6.tar.bz2
platform_external_jemalloc_new-83aa9880b706ab185aa84f2bf6057477efdd5fd6.zip
Make generated headers usable in both x86 and x64 mode in Visual Studio
Diffstat (limited to 'include')
-rw-r--r--include/jemalloc/internal/jemalloc_internal_decls.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal_decls.h b/include/jemalloc/internal/jemalloc_internal_decls.h
index 8ae5ef48..be70df51 100644
--- a/include/jemalloc/internal/jemalloc_internal_decls.h
+++ b/include/jemalloc/internal/jemalloc_internal_decls.h
@@ -5,7 +5,16 @@
#ifdef _WIN32
# include <windows.h>
# include "msvc_compat/windows_extra.h"
-
+# ifdef _WIN64
+# if LG_VADDR <= 32
+# error Generate the headers using x64 vcargs
+# endif
+# else
+# if LG_VADDR > 32
+# undef LG_VADDR
+# define LG_VADDR 32
+# endif
+# endif
#else
# include <sys/param.h>
# include <sys/mman.h>