diff options
| author | Matthijs <mlvdmeide@gmail.com> | 2015-07-27 22:48:27 +0200 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2015-08-04 09:01:48 -0700 |
| commit | c1a6a51e401eb888caff5de142280754e7d99ba3 (patch) | |
| tree | 069603a1b3e7a7b960dd0187a75833cd9b0a7cc8 /src | |
| parent | b49a334a645b854dbb1649f15c38d646fee66738 (diff) | |
| download | jemalloc-c1a6a51e401eb888caff5de142280754e7d99ba3.tar.gz | |
MSVC compatibility changes
- Decorate public function with __declspec(allocator) and __declspec(restrict), just like MSVC 1900
- Support JEMALLOC_HAS_RESTRICT by defining the restrict keyword
- Move __declspec(nothrow) between 'void' and '*' so it compiles once more
Diffstat (limited to 'src')
| -rw-r--r-- | src/jemalloc.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 1d02318..ed7863b 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1395,7 +1395,8 @@ imalloc_body(size_t size, tsd_t **tsd, size_t *usize) return (imalloc(*tsd, size)); } -JEMALLOC_EXPORT void *JEMALLOC_NOTHROW +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) je_malloc(size_t size) { @@ -1540,7 +1541,8 @@ je_posix_memalign(void **memptr, size_t alignment, size_t size) return (ret); } -JEMALLOC_EXPORT void *JEMALLOC_NOTHROW +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(2) je_aligned_alloc(size_t alignment, size_t size) { @@ -1594,7 +1596,8 @@ icalloc_prof(tsd_t *tsd, size_t usize) return (p); } -JEMALLOC_EXPORT void *JEMALLOC_NOTHROW +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE2(1, 2) je_calloc(size_t num, size_t size) { @@ -1739,7 +1742,8 @@ isfree(tsd_t *tsd, void *ptr, size_t usize, tcache_t *tcache) JEMALLOC_VALGRIND_FREE(ptr, rzsize); } -JEMALLOC_EXPORT void *JEMALLOC_NOTHROW +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ALLOC_SIZE(2) je_realloc(void *ptr, size_t size) { @@ -1823,7 +1827,8 @@ je_free(void *ptr) */ #ifdef JEMALLOC_OVERRIDE_MEMALIGN -JEMALLOC_EXPORT void * +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ATTR(malloc) je_memalign(size_t alignment, size_t size) { @@ -1836,7 +1841,8 @@ je_memalign(size_t alignment, size_t size) #endif #ifdef JEMALLOC_OVERRIDE_VALLOC -JEMALLOC_EXPORT void * +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ATTR(malloc) je_valloc(size_t size) { @@ -2031,7 +2037,8 @@ imallocx_no_prof(tsd_t *tsd, size_t size, int flags, size_t *usize) return (p); } -JEMALLOC_EXPORT void *JEMALLOC_NOTHROW +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) je_mallocx(size_t size, int flags) { @@ -2129,7 +2136,8 @@ irallocx_prof(tsd_t *tsd, void *oldptr, size_t old_usize, size_t size, return (p); } -JEMALLOC_EXPORT void *JEMALLOC_NOTHROW +JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN +void JEMALLOC_NOTHROW * JEMALLOC_ALLOC_SIZE(2) je_rallocx(void *ptr, size_t size, int flags) { |