X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=shape.c;h=f45715866b11a44473c9a788f4a61fe591286e7d;hp=9e03f19a49f395dd47eefad595fed200313783bd;hb=30498ebe775df3854f28946b1373da948bd190a3;hpb=f886a80d1a22f96e90d7a5c3cd5e10a8e459cc34

diff --git a/shape.c b/shape.c
index 9e03f19..f457158 100644
--- a/shape.c
+++ b/shape.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include "common.h"
 #include "shape.h"
 
 void
@@ -39,18 +40,6 @@ get_shape(SDL_Surface *img, struct shape *s)
 	SDL_UnlockSurface(img);
 }
 
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef abs
-#define abs(a) ((a)<=0 ? -(a) : (a))
-#endif
-
 int
 line_collide(int xov, struct shape *r, uint32_t *rbits, struct shape *s, uint32_t *sbits)
 {