diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 11:23:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-25 11:23:46 +0000 |
| commit | 2cac171ddedfecdfc6fa27c5326f9eebfab1822e (patch) | |
| tree | ff8e7c162875d7374ddc42224a91533b7e8c8663 /src/3rdparty/harfbuzz-ng/src/hb-private.hh | |
| parent | 5113fdeb7d50979c6acbe2c9c5b26ad134614873 (diff) | |
| parent | 709e40093e6081b18e0d3003e0a088e1a9b6f211 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty/harfbuzz-ng/src/hb-private.hh')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-private.hh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-private.hh b/src/3rdparty/harfbuzz-ng/src/hb-private.hh index 45b7712ce8..cfe77f1606 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-private.hh +++ b/src/3rdparty/harfbuzz-ng/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) |