Fix merge conflicts

[bsdgames-darwin.git] / phantasia / macros.h

diff --git a/phantasia/macros.h b/phantasia/macros.h
index e2327421d615922782931d4948cecf30b2f8b712..39b003c3480d5a1f0fd1dd78401fb6e4a99da8f8 100644 (file)
--- a/phantasia/macros.h
+++ b/phantasia/macros.h
@@ -1,3 +1,5 @@
+/*     $NetBSD: macros.h,v 1.3 1995/04/24 12:24:34 cgd Exp $   */
+
 /*
  * macros.h - macro definitions for Phantasia
  */
@@ -5,7 +7,9 @@
 #define ROLL(BASE,INTERVAL)    floor((BASE) + (INTERVAL) * drandom())
 #define SGN(X)         ((X) < 0 ? -1 : 1)
 #define CIRCLE(X, Y)   floor(distance(X, 0.0, Y, 0.0) / 125.0 + 1)
+#undef MAX
 #define MAX(A, B)      ((A) > (B) ? (A) : (B))
+#undef MIN
 #define MIN(A, B)      ((A) < (B) ? (A) : (B))
 #define ILLCMD()       mvaddstr(5, 0, Illcmd)
 #define MAXMOVE()      (Player.p_level * 1.5 + 1)