[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-private.hh |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit faaae64bf28abdcdd15185374bc09a3809794118
Merge: 7888a6b 9768e65
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 25 15:34:34 2015 -0800

    Merge pull request #85 from KonstantinRitt/define_inline
    
    Fix build with MSVC on CE

commit 9768e651be0561f07d6f38c3ed8bc5ee04882990
Author: Konstantin Ritt <ritt.ks at gmail.com>
Date:   Sat Feb 14 00:58:51 2015 +0400

    Fix build with MSVC on CE
    
    This code is C++ only. There isn't a single C++ compiler that fails to
    understand the "inline" keyword, since it's required by C++98. Any
    compiler older than C++98 is likely to choke on the template usage
    further down, so this isn't necessary.
    
    Moreover, the C++ standard says you cannot define macros.
    [lib.macro.names] says "Nor shall such a translation unit define macros
    for names lexically identical to keywords." -- technically, it's a
    promise that the Standard Library headers won't do it, the wording means
    that the entire translation unit won't do it, which implies no source
    can do it.
    
    MSVC complains about it:
    fatal error C1189: #error : The C++ Standard Library forbids macroizing
    keywords. Enable warning C4005 to find the forbidden macro.
    
    Author: Thiago Macieira <thiago.macieira at intel.com>

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 45b7712..cfe77f1 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -94,16 +94,6 @@
 # endif
 #endif
 
-#ifdef _MSC_VER
-#undef inline
-#define inline __inline
-#endif
-
-#ifdef __STRICT_ANSI__
-#undef inline
-#define inline __inline__
-#endif
-
 #if __GNUC__ >= 3
 #define HB_FUNC __PRETTY_FUNCTION__
 #elif defined(_MSC_VER)