diff options
| -rw-r--r-- | libcxx/docs/DesignDocs/VisibilityMacros.rst | 17 | ||||
| -rw-r--r-- | libcxx/include/new | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/libcxx/docs/DesignDocs/VisibilityMacros.rst b/libcxx/docs/DesignDocs/VisibilityMacros.rst index f45d67b17ea..67886e392ae 100644 --- a/libcxx/docs/DesignDocs/VisibilityMacros.rst +++ b/libcxx/docs/DesignDocs/VisibilityMacros.rst @@ -112,14 +112,15 @@ Visibility Macros Mark a symbol as being exported by the libc++ library. This macro must be applied to all `operator new` and `operator delete` overloads. - **Windows Behavior**: When using the Microsoft CRT, all the `operator new` and - `operator delete` overloads are defined statically in `msvcrt.lib`. Marking - them as `dllimport` in the libc++ `<new>` header is therefore undesirable: if - we were to mark them as `dllimport` and then link against libc++, source files - which included `<new>` would end up linking against libc++'s `operator new` - and `operator delete`, while source files which did not include `<new>` would - end up linking against msvcrt's `operator new` and `operator delete`, which - would be a confusing and potentially error-prone inconsistency. + **Windows Behavior**: The `operator new` and `operator delete` overloads + should not be marked as `dllimport`; if they were, source files including the + `<new>` header (either directly or transitively) would lose the ability to use + local overloads of `operator new` and `operator delete`. On Windows, this + macro therefore expands to `__declspec(dllexport)` when building the library + and has an empty definition otherwise. A related caveat is that libc++ must be + included on the link line before `msvcrt.lib`, otherwise Microsoft's + definitions of `operator new` and `operator delete` inside `msvcrt.lib` will + end up being used instead of libc++'s. Links ===== diff --git a/libcxx/include/new b/libcxx/include/new index 16b3011efb2..e77d3e6d624 100644 --- a/libcxx/include/new +++ b/libcxx/include/new @@ -125,7 +125,7 @@ _LIBCPP_FUNC_VIS new_handler get_new_handler() _NOEXCEPT; } // std -#if defined(_LIBCPP_MSVCRT) && !defined(_LIBCPP_BUILDING_LIBRARY) +#if defined(_WIN32) && !defined(_LIBCPP_BUILDING_LIBRARY) # define _LIBCPP_NEW_DELETE_VIS #else # define _LIBCPP_NEW_DELETE_VIS _LIBCPP_FUNC_VIS |
