From c16270c8f3d3c04ccb27a421a7fa9decb40a50b7 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 31 Mar 2015 09:52:57 -1000 Subject: [PATCH] Bug 1119776, Part 9: Avoid defining snprintf when MSVC provides it (harfbuzz), r=behdad --HG-- extra : rebase_source : fe06a72a4a3b7ce51edabdb9fbefce1d3d2011e3 --- gfx/harfbuzz/src/hb-private.hh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh index c92cdec5164d..8450c749ffaa 100644 --- a/gfx/harfbuzz/src/hb-private.hh +++ b/gfx/harfbuzz/src/hb-private.hh @@ -94,10 +94,8 @@ # endif #endif -#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf -/* Windows CE only has _strdup, while rest of Windows has both. */ -#define strdup _strdup #endif #ifdef _MSC_VER