X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fmath%2Fvector.h;h=777d9d3815526a730817ac88ea9f641125965650;hb=501f88301a06994affeac524b24541c3d7a651c0;hp=15c31def3aaf871ef252c3a910c591c9b7d223df;hpb=520f83054eb51b155cf25954649b2e2d1e4260ce;p=xonotic%2Fnetradiant.git diff --git a/libs/math/vector.h b/libs/math/vector.h index 15c31def..777d9d38 100644 --- a/libs/math/vector.h +++ b/libs/math/vector.h @@ -27,13 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "generic/vector.h" -#if 0 - -#define lrint(dbl) ((int)((dbl) + 0.5)) -#define lrintf(flt) ((int)((flt) + 0.5)) - -#endif - #if defined (_MSC_VER) inline int lrint (double flt) @@ -49,20 +42,31 @@ inline int lrint (double flt) return i; } -#else // lrint is part of ISO C99 +#elif defined(__FreeBSD__) +inline int lrint(double f) +{ + return static_cast(f + 0.5); +} + +#elif defined(__GCC__) + + // lrint is part of ISO C99 #define _ISOC9X_SOURCE 1 #define _ISOC99_SOURCE 1 #define __USE_ISOC9X 1 #define __USE_ISOC99 1 +#else +#error "unsupported platform" #endif #include #include #include + //#include "debugging/debugging.h" /// \brief Returns true if \p self is equal to other \p other within \p epsilon.