Skip to content

Commit 641d80f

Browse files
author
Emery Berger
committed
Moved.
1 parent b418fa4 commit 641d80f

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

wrappers/wrapper.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,6 @@ extern "C" {
106106
#define CUSTOM_MALLOC_SET_STATE(p) CUSTOM_PREFIX(malloc_set_state)(p)
107107
#define CUSTOM_MALLINFO(a) CUSTOM_PREFIX(mallinfo)(a)
108108

109-
#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
110-
extern "C" void* __libc_malloc(size_t n) __attribute__((visibility("default")));
111-
extern "C" void __libc_free(void* p) __attribute__((visibility("default")));
112-
extern "C" void* __libc_calloc(size_t a,size_t b) __attribute__((visibility("default")));
113-
extern "C" void* __libc_realloc(void* p,size_t n) __attribute__((visibility("default")));
114-
115-
extern "C" void* __libc_malloc(size_t n){ return CUSTOM_MALLOC(n); }
116-
extern "C" void __libc_free(void* p){ CUSTOM_FREE(p); }
117-
extern "C" void* __libc_calloc(size_t a,size_t b){ return CUSTOM_CALLOC(a,b); }
118-
extern "C" void* __libc_realloc(void* p,size_t n){ return CUSTOM_REALLOC(p,n); }
119-
#endif
120-
121109
#if defined(_WIN32)
122110
#define MYCDECL __cdecl
123111
#if !defined(NO_INLINE)
@@ -584,3 +572,16 @@ int CUSTOM_PUTENV(char * str) {
584572
}
585573

586574
#endif
575+
576+
#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
577+
extern "C" void* __libc_malloc(size_t n) __attribute__((visibility("default")));
578+
extern "C" void __libc_free(void* p) __attribute__((visibility("default")));
579+
extern "C" void* __libc_calloc(size_t a,size_t b) __attribute__((visibility("default")));
580+
extern "C" void* __libc_realloc(void* p,size_t n) __attribute__((visibility("default")));
581+
582+
extern "C" void* __libc_malloc(size_t n){ return CUSTOM_MALLOC(n); }
583+
extern "C" void __libc_free(void* p){ CUSTOM_FREE(p); }
584+
extern "C" void* __libc_calloc(size_t a,size_t b){ return CUSTOM_CALLOC(a,b); }
585+
extern "C" void* __libc_realloc(void* p,size_t n){ return CUSTOM_REALLOC(p,n); }
586+
#endif
587+

0 commit comments

Comments
 (0)