Merge pull request #61 from sarfata/do-not-redefine-bit

Do not redefine macro BIT(x) if already defined
sarfata · Jul 24, 2017 · 6835188 · 6835188
2 parents ab2b499 + 6d6fe93
commit 6835188
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/N2kMsg.h b/src/N2kMsg.h
@@ -38,7 +38,9 @@ const uint16_t N2kUInt16NA=0xffff;
 const int16_t  N2kInt16NA=0x7fff;
 const uint32_t N2kUInt32NA=0xffffffff;
 const int32_t  N2kInt32NA=0x7fffffff;
+#ifndef BIT
 #define BIT(n) (1 << n)
+#endif
 
 inline bool N2kIsNA(double v) { return v==N2kDoubleNA; }
 inline bool N2kIsNA(uint8_t v) { return v==N2kUInt8NA; }