diff --git a/ChangeLog b/ChangeLog
index 4b726e55a..9a92da07a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-17  Werner Lemberg  <wl@gnu.org>
+
+	s/inline/__inline/ for MSVC.
+
+	Reported by John Emmas <john@creativepost.co.uk>.
+
+	* include/freetype/internal/ftcalc.h (FT_MSB) [_MSC_VER]: Do it.
+
 2018-05-16  Werner Lemberg  <wl@gnu.org>
 
 	Add function `FT_Get_GlyphLayers' to access `COLR' table data.
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index 3f889e631..d3c074b5f 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -362,7 +362,7 @@ FT_BEGIN_HEADER
 
 #include <intrin.h>
 
-  static inline FT_Int32
+  static __inline FT_Int32
   FT_MSB_i386( FT_UInt32  x )
   {
     unsigned long  where;