Skip to content

Commit faefb70

Browse files
committed
[libc++][NFC] Remove _LIBCPP_DLL_VIS
This macro is only ever used inside the definiton for the various visibility macros on windows. There, it's defined in multiple places with different expansions, which makes it more confusing than helpful when trying to figure out what macro expands to what.
1 parent 1cb6ba5 commit faefb70

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

libcxx/include/__config

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,25 +363,22 @@ typedef __char32_t char32_t;
363363
# endif
364364

365365
# if defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) || (defined(__MINGW32__) && !defined(_LIBCPP_BUILDING_LIBRARY))
366-
# define _LIBCPP_DLL_VIS
367366
# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
368367
# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
369368
# define _LIBCPP_OVERRIDABLE_FUNC_VIS
370369
# define _LIBCPP_EXPORTED_FROM_ABI
371370
# elif defined(_LIBCPP_BUILDING_LIBRARY)
372-
# define _LIBCPP_DLL_VIS __declspec(dllexport)
373371
# if defined(__MINGW32__)
374-
# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_DLL_VIS
372+
# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __declspec(dllexport)
375373
# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
376374
# else
377375
# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
378-
# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DLL_VIS
376+
# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS __declspec(dllexport)
379377
# endif
380-
# define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_DLL_VIS
378+
# define _LIBCPP_OVERRIDABLE_FUNC_VIS __declspec(dllexport)
381379
# define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllexport)
382380
# else
383-
# define _LIBCPP_DLL_VIS __declspec(dllimport)
384-
# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_DLL_VIS
381+
# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __declspec(dllimport)
385382
# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
386383
# define _LIBCPP_OVERRIDABLE_FUNC_VIS
387384
# define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllimport)

0 commit comments

Comments
 (0)