From 5c3303eef094d4beaabbe462b35fcb041ecd501a Mon Sep 17 00:00:00 2001
From: harald42 <harald@digiel-5.7>
Date: Wed, 31 Jul 2013 15:20:24 +0200
Subject: [PATCH] bugfix compile error

---
 examples/osd/rpl-border-router/Makefile      | 2 +-
 examples/osd/rpl-border-router/slip-bridge.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/osd/rpl-border-router/Makefile b/examples/osd/rpl-border-router/Makefile
index 43230a17f..04007ff5b 100644
--- a/examples/osd/rpl-border-router/Makefile
+++ b/examples/osd/rpl-border-router/Makefile
@@ -5,7 +5,7 @@ CONTIKI=../../..
 
 WITH_UIP6=1
 UIP_CONF_IPV6=1
-CFLAGS+= -DUIP_CONF_IPV6_RPL
+CFLAGS+= -DUIP_CONF_IPV6_RPL -DUIP_CONF_IPV6
 
 #linker optimizations
 SMALL=1
diff --git a/examples/osd/rpl-border-router/slip-bridge.c b/examples/osd/rpl-border-router/slip-bridge.c
index c7d718501..ebf4f3c36 100644
--- a/examples/osd/rpl-border-router/slip-bridge.c
+++ b/examples/osd/rpl-border-router/slip-bridge.c
@@ -118,6 +118,7 @@ output(void)
 }
 
 /*---------------------------------------------------------------------------*/
+#if !SLIP_BRIDGE_CONF_NO_PUTCHAR
 #undef putchar
 int
 putchar(int c)
@@ -145,6 +146,7 @@ putchar(int c)
   }
   return c;
 }
+#endif
 /*---------------------------------------------------------------------------*/
 const struct uip_fallback_interface rpl_interface = {
   init, output