Merge branch 'crashey' of github.com:cjdelisle/cjdns into crashey

node_build/make.js

@@ -141,9 +141,10 @@ Builder.configure({
 
             // lots of places where depending on preprocessor conditions, a statement might be
             // a case of if (1 == 1)
-            '-Wno-tautological-compare'
+            '-Wno-tautological-compare',
 
             //'-Wno-error'
+            '-Wno-gnu-line-marker'
         );
     } else {
         builder.config.cflags.push(

util/platform/netdev/NetPlatform_darwin.c

@@ -222,7 +222,7 @@ static Er_DEFUN(struct ArrayList_OfPrefix* getRoutes(uint32_t ifIndex,
             prefix = prefixFromWeirdBSDMask(mask, ipv6);
         }
         struct Prefix* pfx = Allocator_calloc(allocator, sizeof(struct Prefix), 1);
-        Assert_compileTime(sizeof(pfx->ss) >= sa1->sa_len);
+        Assert_true(sizeof(pfx->ss) >= sa1->sa_len);
         Bits_memcpy(&pfx->ss, sa1, sa1->sa_len);
         pfx->prefix = prefix;
         ArrayList_OfPrefix_add(addrList, pfx);