mozilla-central: changeset 225320:9083ef23526aa87e70a3e6d07f7936f005dd7692

author	Nicholas Nethercote <nnethercote@mozilla.com>
	Wed, 21 Jan 2015 19:23:28 -0800
changeset 225320	9083ef23526aa87e70a3e6d07f7936f005dd7692
parent 225319	5cd5233505fcad0fa7a15562b909b0c6d3ddef8a
child 225321	79010299a931eb56ba814c0e48fb66e2ab9ec1cc
push id	28159
push user	ryanvm@gmail.com
push date	Fri, 23 Jan 2015 17:30:19 +0000
treeherder	mozilla-central@a6bbabebed2f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dholbert
bugs	1123527
milestone	38.0a1
first release with	nightly linux32 a6bbabebed2f / 38.0a1 / 20150123093302 / files nightly linux64 a6bbabebed2f / 38.0a1 / 20150123093302 / files nightly mac a6bbabebed2f / 38.0a1 / 20150123093302 / files nightly win32 a6bbabebed2f / 38.0a1 / 20150123093302 / files nightly win64 a6bbabebed2f / 38.0a1 / 20150123093302 / files
last release without	nightly linux32 494632b9afed / 38.0a1 / 20150123030203 / files nightly linux64 494632b9afed / 38.0a1 / 20150123030203 / files nightly mac 494632b9afed / 38.0a1 / 20150123030203 / files nightly win32 494632b9afed / 38.0a1 / 20150123030203 / files nightly win64 494632b9afed / 38.0a1 / 20150123030203 / files

--- a/gfx/src/nsCoord.h
+++ b/gfx/src/nsCoord.h
@@ -208,18 +208,18 @@ NSCoordSaturatingSubtract(nscoord a, nsc
     if (a == nscoord_MAX) {
       // case (c) for integers
       return nscoord_MAX;
     } else {
       // case (d) for integers
       // Cap the result, in case we're dealing with numbers near nscoord_MAX
       return std::min(nscoord_MAX, a - b);
     }
+#endif
   }
-#endif
 }
 
 inline float NSCoordToFloat(nscoord aCoord) {
   VERIFY_COORD(aCoord);
 #ifdef NS_COORD_IS_FLOAT
   NS_ASSERTION(!NS_IEEEIsNan(aCoord), "NaN encountered in float conversion");
 #endif
   return (float)aCoord;