diff --git a/include/fmt/core.h b/include/fmt/core.h
index 3c55ef6f..7e22c166 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -207,8 +207,7 @@ using enable_if_t = typename std::enable_if<B, T>::type;
 // enable_if helpers to be used in template parameters which results in much
 // shorter symbols: https://godbolt.org/z/sWw4vP.
 // Also include fix for VS2019 compilation issue (see #1140 and #1186).
-#define FMT_ENABLE_IF_T(...) enable_if_t<(__VA_ARGS__), int>
-#define FMT_ENABLE_IF(...) FMT_ENABLE_IF_T(__VA_ARGS__) = 0
+#define FMT_ENABLE_IF(...) enable_if_t<(__VA_ARGS__), int> = 0
 
 namespace internal {
 
diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
index dd34c315..8778337e 100644
--- a/include/fmt/format-inl.h
+++ b/include/fmt/format-inl.h
@@ -674,7 +674,8 @@ template <int GRISU_VERSION> struct grisu_shortest_handler {
   }
 };
 
-template <typename Double, FMT_ENABLE_IF_T(sizeof(Double) == sizeof(uint64_t))>
+template <typename Double,
+          enable_if_t<(sizeof(Double) == sizeof(uint64_t)), int>>
 FMT_API bool grisu_format(Double value, buffer<char>& buf, int precision,
                           unsigned options, int& exp) {
   FMT_ASSERT(value >= 0, "value is negative");
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 934ef851..f1c623cc 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -2246,7 +2246,7 @@ FMT_CONSTEXPR bool do_check_format_string(basic_string_view<Char> s,
 }
 
 template <typename... Args, typename S,
-          FMT_ENABLE_IF_T(is_compile_string<S>::value)>
+          enable_if_t<(is_compile_string<S>::value), int>>
 void check_format_string(S format_str) {
   typedef typename S::char_type char_t;
   FMT_CONSTEXPR_DECL bool invalid_format =