diff --git a/include/fmt/core.h b/include/fmt/core.h
index b2236b33..7df62b00 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -170,7 +170,7 @@
 #endif
 
 #ifndef FMT_INLINE
-#  if FMT_GCC_VERSION && FMT_USE_CONSTEXPR
+#  if FMT_GCC_VERSION || FMT_CLANG_VERSION
 #    define FMT_INLINE inline __attribute__((always_inline))
 #  else
 #    define FMT_INLINE inline
diff --git a/include/fmt/format.h b/include/fmt/format.h
index d9b58eaa..32d27e87 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -2475,8 +2475,8 @@ template <typename Handler, typename Char> struct id_adapter {
 };
 
 template <bool IS_CONSTEXPR, typename Char, typename Handler>
-FMT_CONSTEXPR void parse_format_string(basic_string_view<Char> format_str,
-                                       Handler&& handler) {
+FMT_CONSTEXPR_DECL FMT_INLINE void parse_format_string(
+    basic_string_view<Char> format_str, Handler&& handler) {
   struct writer {
     FMT_CONSTEXPR void operator()(const Char* begin, const Char* end) {
       if (begin == end) return;