From b37d956cff13eaf409f711fa9cee2f69d52d02b7 Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Fri, 1 Mar 2013 18:28:20 +0100
Subject: [PATCH] [airborne] std.h: define NULL if not already done

---
 sw/include/std.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sw/include/std.h b/sw/include/std.h
index 4a5644b156a..a8b86408e98 100644
--- a/sw/include/std.h
+++ b/sw/include/std.h
@@ -61,6 +61,14 @@
 #define TRUE (!FALSE)
 #endif
 
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif
+#endif
+
 /* Boolean values */
 typedef uint8_t bool_t;
 
@@ -156,7 +164,7 @@ typedef uint8_t unit_t;
 
 #define RunXTimesEvery(_jumpstart, _prescaler, _interval, _xtimes, _code) {		\
   static uint16_t prescaler = _jumpstart;			\
-  static uint16_t xtimes = 0;		         	\
+  static uint16_t xtimes = 0;                   \
   prescaler++;					\
   if (prescaler >= _prescaler + _interval*xtimes && xtimes < _xtimes) {			\
     _code;						\