From 75eedead9993a09674baa6afe6df8092a6fdb097 Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Sun, 27 Oct 2013 21:14:22 -0700 Subject: [PATCH] Give llround its own namespace to not conflict with 'long long round' in newer compilers --- indra/llmath/llmath.h | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index c94770e301..170309e3d8 100755 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -193,6 +193,7 @@ inline S32 llceil( F32 f ) #ifndef BOGUS_ROUND // Use this round. Does an arithmetic round (0.5 always rounds up) +#define llround _llround // added to not conflict with 'Long Long Round' in newer compilers inline S32 llround(const F32 val) { return llfloor(val + 0.5f);