2017

[folly.git] / folly / detail / Malloc.h

diff --git a/folly/detail/Malloc.h b/folly/detail/Malloc.h
index 4a7fa73b313b3d356f6e4bb8aca3daf9bae7809e..74358f1ce39fb38118521dcbba389a1cdbfd1200 100644 (file)
--- a/folly/detail/Malloc.h
+++ b/folly/detail/Malloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,39 +35,6 @@ int mallctl(const char*, void*, size_t*, void*, size_t)
 int mallctlnametomib(const char*, size_t*, size_t*) __attribute__((__weak__));
 int mallctlbymib(const size_t*, size_t, void*, size_t*, void*, size_t)
       __attribute__((__weak__));
-#elif defined(_MSC_VER)
-// MSVC doesn't have weak symbols, so do some linker magic
-// to emulate them.
-extern void* (*mallocx)(size_t, int);
-extern const char* mallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_mallocx=_mallocxWeak")
-extern void* (*rallocx)(void*, size_t, int);
-extern const char* rallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_rallocx=_rallocxWeak")
-extern size_t(*xallocx)(void*, size_t, size_t, int);
-extern const char* xallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_xallocx=_xallocxWeak")
-extern size_t(*sallocx)(const void*, int);
-extern const char* sallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_sallocx=_sallocxWeak")
-extern void(*dallocx)(void*, int);
-extern const char* dallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_dallocx=_dallocxWeak")
-extern void(*sdallocx)(void*, size_t, int);
-extern const char* sdallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_sdallocx=_sdallocxWeak")
-extern size_t(*nallocx)(size_t, int);
-extern const char* nallocxWeak = nullptr;
-#pragma comment(linker, "/alternatename:_nallocx=_nallocxWeak")
-extern int(*mallctl)(const char*, void*, size_t*, void*, size_t);
-extern const char* mallctlWeak = nullptr;
-#pragma comment(linker, "/alternatename:_mallctl=_mallctlWeak")
-extern int(*mallctlnametomib)(const char*, size_t*, size_t*);
-extern const char* mallctlnametomibWeak = nullptr;
-#pragma comment(linker, "/alternatename:_mallctlnametomib=_mallctlnametomibWeak")
-extern int(*mallctlbymib)(const size_t*, size_t, void*, size_t*, void*, size_t);
-extern const char* mallctlbymibWeak = nullptr;
-#pragma comment(linker, "/alternatename:_mallctlbymib=_mallctlbymibWeak")
 #else
 extern void* (*mallocx)(size_t, int);
 extern void* (*rallocx)(void*, size_t, int);
@@ -80,6 +47,20 @@ extern int (*mallctl)(const char*, void*, size_t*, void*, size_t);
 extern int (*mallctlnametomib)(const char*, size_t*, size_t*);
 extern int (*mallctlbymib)(const size_t*, size_t, void*, size_t*, void*,
                            size_t);
+#ifdef _MSC_VER
+// We emulate weak linkage for MSVC. The symbols we're
+// aliasing to are hiding in MallocImpl.cpp
+#pragma comment(linker, "/alternatename:mallocx=mallocxWeak")
+#pragma comment(linker, "/alternatename:rallocx=rallocxWeak")
+#pragma comment(linker, "/alternatename:xallocx=xallocxWeak")
+#pragma comment(linker, "/alternatename:sallocx=sallocxWeak")
+#pragma comment(linker, "/alternatename:dallocx=dallocxWeak")
+#pragma comment(linker, "/alternatename:sdallocx=sdallocxWeak")
+#pragma comment(linker, "/alternatename:nallocx=nallocxWeak")
+#pragma comment(linker, "/alternatename:mallctl=mallctlWeak")
+#pragma comment(linker, "/alternatename:mallctlnametomib=mallctlnametomibWeak")
+#pragma comment(linker, "/alternatename:mallctlbymib=mallctlbymibWeak")
+#endif
 #endif
 
 }