diff --git a/vroni/Include/approx.h b/vroni/Include/approx.h index 2032daa..0fbff56 100644 --- a/vroni/Include/approx.h +++ b/vroni/Include/approx.h @@ -48,7 +48,7 @@ inline void ApproxArc(const coord & p1, const coord & p2, if (apx_absolute > 0.0) { incr = acos(radius / (radius + apx_absolute)); - incr = Min(incr, max_incr); + incr = VroniMin(incr, max_incr); } else { incr = max_incr; diff --git a/vroni/Include/util.h b/vroni/Include/util.h index d86682b..70cc785 100644 --- a/vroni/Include/util.h +++ b/vroni/Include/util.h @@ -99,8 +99,8 @@ inline static double CubicRoot(double_arg x) (i1) = (i2); \ (i2) = (i); } -#define Min(a, b) ((a) < (b) ? (a) : (b)) -#define Max(a, b) ((b) < (a) ? (a) : (b)) +#define VroniMin(a, b) ((a) < (b) ? (a) : (b)) +#define VroniMax(a, b) ((b) < (a) ? (a) : (b)) #define Min3(a, b, c) (((a) < (b)) ? \ (((a) < (c)) ? \ (a) : (c)) \ diff --git a/vroni/Lib/vroniD32.lib b/vroni/Lib/vroniD32.lib index de3f284..c8f77da 100644 Binary files a/vroni/Lib/vroniD32.lib and b/vroni/Lib/vroniD32.lib differ diff --git a/vroni/Lib/vroniD64.lib b/vroni/Lib/vroniD64.lib index dc07309..ed40eca 100644 Binary files a/vroni/Lib/vroniD64.lib and b/vroni/Lib/vroniD64.lib differ diff --git a/vroni/Lib/vroniR32.lib b/vroni/Lib/vroniR32.lib index 5bb2802..a35a8ac 100644 Binary files a/vroni/Lib/vroniR32.lib and b/vroni/Lib/vroniR32.lib differ diff --git a/vroni/Lib/vroniR64.lib b/vroni/Lib/vroniR64.lib index 55aeeec..f125f45 100644 Binary files a/vroni/Lib/vroniR64.lib and b/vroni/Lib/vroniR64.lib differ