compile ok so far; before OutEdge iterator redo

[moebius2.git] / mgraph.h

diff --git a/mgraph.h b/mgraph.h
index 46383677d2ec6c153e799d5936329529d3e75de2..24b02dc97318d6e8fc76316cac21f659ae90a3fd 100644 (file)
--- a/mgraph.h
+++ b/mgraph.h
@@ -52,6 +52,8 @@
 #ifndef MGRAPH_H
 #define MGRAPH_H
 
+#include "common.h"
+
 #define XBITS 4
 #define X (1<<XBITS)
 #define YBITS 4
@@ -65,7 +67,7 @@
 #define XMASK (X-1)
 #define YSHIFT XBITS
 #define Y1 (1 << YSHIFT)
-#define YMASK (Y-1 << YSHIFT)
+#define YMASK ((Y-1) << YSHIFT)
 
 #define V6 6
 
@@ -85,7 +87,7 @@ extern int edge_end2(unsigned v1, int e);
   FOR_VPEDGE((v1),(e))                         \
     if (((v2)= EDGE_END2((v1),(e)),            \
         (init),                                \
-        (v2)) < 0) { otherwise } else
+        (v2)) < 0) { otherwise; } else
 
 #define NOTHING ((void)0)