Bug 1022033 - Disable NS_lroundup30 on clang-cl; r=jrmuizel

This function contains inline assembly which clang-cl can't compile yet.
This commit is contained in:
Ehsan Akhgari 2014-06-06 20:13:48 -04:00
parent 8c909b4cd5
commit 0d4e61e13c
2 changed files with 3 additions and 3 deletions

View File

@ -59,7 +59,7 @@ inline void VERIFY_COORD(nscoord aCoord) {
inline nscoord NSToCoordRound(float aValue)
{
#if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
#if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__) && !defined(__clang__)
return NS_lroundup30(aValue);
#else
return nscoord(floorf(aValue + 0.5f));
@ -68,7 +68,7 @@ inline nscoord NSToCoordRound(float aValue)
inline nscoord NSToCoordRound(double aValue)
{
#if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
#if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__) && !defined(__clang__)
return NS_lroundup30((float)aValue);
#else
return nscoord(floor(aValue + 0.5f));

View File

@ -35,7 +35,7 @@ inline int32_t NS_lround(double x)
/* NS_roundup30 rounds towards infinity for positive and */
/* negative numbers. */
#if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
#if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__) && !defined(__clang__)
inline int32_t NS_lroundup30(float x)
{
/* Code derived from Laurent de Soras' paper at */