From ce46b7c6cbe128bd959c6f674d9337647c45fe03 Mon Sep 17 00:00:00 2001
From: joxe <joxe>
Date: Wed, 12 Jan 2011 18:32:36 +0000
Subject: [PATCH] patched rest-code for econotag

---
 apps/rest-coap/coap-common.c | 12 +++++++-----
 apps/rest-coap/coap-server.c |  4 +++-
 apps/rest-common/buffer.c    |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/rest-coap/coap-common.c b/apps/rest-coap/coap-common.c
index 57f6586fa..0a23fa0c5 100644
--- a/apps/rest-coap/coap-common.c
+++ b/apps/rest-coap/coap-common.c
@@ -5,10 +5,7 @@
  *      Author: dogan
  */
 
-#ifdef CONTIKI_TARGET_SKY
-  #include "contiki.h"
-  #include "contiki-net.h"
-#else
+#ifdef CONTIKI_TARGET_NETSIM
   #include <stdio.h>
   #include <iostream>
   #include <cstring>
@@ -21,6 +18,10 @@
   #include <netinet/in.h>
   #include <arpa/inet.h>
   #include <netdb.h>
+#else
+  #include "contiki.h"
+  #include "contiki-net.h"
+  #include <string.h>
 #endif
 
 #include "coap-common.h"
@@ -81,7 +82,8 @@ int serialize_packet(coap_packet_t* packet, uint8_t* buffer)
     }
     buffer[index] = (delta) << COAP_HEADER_OPTION_DELTA_POSITION;
 
-    PRINTF("option %u len %u option diff %u option_value addr %x option addr %x next option addr %x", option->option, option->len, option->option - option_delta, (uint16_t) option->value, (uint16_t)option, (uint16_t)option->next);
+    PRINTF("option %u len %u option diff %u option_value addr %x option addr %x next option addr %x", option->option, option->len, option->option - option_delta, (unsigned int) option->value, (unsigned int)option, (unsigned int)option->next);
+
     int i = 0;
     for ( ; i < option->len ; i++ ){
       PRINTF(" (%u)", option->value[i]);
diff --git a/apps/rest-coap/coap-server.c b/apps/rest-coap/coap-server.c
index 03d4e98d1..4b462fbb7 100644
--- a/apps/rest-coap/coap-server.c
+++ b/apps/rest-coap/coap-server.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h> /*for isxdigit*/
 #include "contiki.h"
 #include "contiki-net.h"
@@ -204,7 +205,8 @@ coap_set_option(coap_packet_t* packet, option_type option_type, uint16_t len, ui
 
     packet->option_count++;
 
-    PRINTF("option->len %u option->option %u option->value %x next %x\n", option->len, option->option, (uint16_t) option->value, (uint16_t)option->next);
+    PRINTF("option->len %u option->option %u option->value %x next %x\n", option->len, option->option, (unsigned int) option->value, (unsigned int)option->next);
+
     int i = 0;
     for ( ; i < option->len ; i++ ){
       PRINTF(" (%u)", option->value[i]);
diff --git a/apps/rest-common/buffer.c b/apps/rest-common/buffer.c
index 736e7cd86..3860027bd 100644
--- a/apps/rest-common/buffer.c
+++ b/apps/rest-common/buffer.c
@@ -7,6 +7,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include "buffer.h"
 
 uint8_t* data_buffer;