diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 082b5cbb0c50893406f6ea62d87bf96f42c0903f..4ac19c9613c65ac12c9d5a1e764e4633cd565903 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -42,18 +42,8 @@
 // llcommon depend on llmath.
 #include "is_approx_equal_fraction.h"
 
-// work around for Windows & older gcc non-standard function names.
-#if LL_WINDOWS
-#include <float.h>
-#define llisnan(val)	_isnan(val)
-#define llfinite(val)	_finite(val)
-#elif (LL_LINUX && __GNUC__ <= 2)
-#define llisnan(val)	isnan(val)
-#define llfinite(val)	isfinite(val)
-#else
 #define llisnan(val)	std::isnan(val)
 #define llfinite(val)	std::isfinite(val)
-#endif
 
 // Single Precision Floating Point Routines
 // (There used to be more defined here, but they appeared to be redundant and