Merge remote-tracking branch 'upstream/master'

RIOT-OS · May 30, 2013 · 5795bd6 · 5795bd6
2 parents 42f897f + 01f2cb2
commit 5795bd6
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ doc/doxygen/html
 doc/doxygen/latex
 doc/doxygen/man
 *bin
+*~
diff --git a/sys/net/destiny/socket.c b/sys/net/destiny/socket.c
@@ -16,8 +16,8 @@
 #include "hwtimer.h"
 #include "tcp_timer.h"
 #include "tcp_hc.h"
-#include "sys/net/net_help/net_help.h"
-#include "sys/net/net_help/msg_help.h"
+#include "../net_help/net_help.h"
+#include "../net_help/msg_help.h"
 
 socket_internal_t sockets[MAX_SOCKETS];
 

diff --git a/sys/net/destiny/socket.h b/sys/net/destiny/socket.h
@@ -12,7 +12,7 @@
 #include "tcp.h"
 #include "udp.h"
 #include "in.h"
-#include "sys/net/sixlowpan/sixlowip.h"
+#include "../sixlowpan/sixlowip.h"
 
 /*
  * Types

diff --git a/sys/net/destiny/tcp.c b/sys/net/destiny/tcp.c
@@ -16,9 +16,9 @@
 #include "tcp.h"
 #include "in.h"
 #include "socket.h"
-#include "sys/net/net_help/net_help.h"
-#include "sys/net/net_help/msg_help.h"
-#include "sys/net/sixlowpan/sixlowpan.h"
+#include "../net_help/net_help.h"
+#include "../net_help/msg_help.h"
+#include "../sixlowpan/sixlowpan.h"
 
 void printTCPHeader(tcp_hdr_t *tcp_header)
 	{

diff --git a/sys/net/destiny/tcp.h b/sys/net/destiny/tcp.h
@@ -71,7 +71,7 @@ enum tcp_codes
 
 #define TCP_STACK_SIZE 			1024
 
-#include "sys/net/sixlowpan/sixlowip.h"
+#include "../sixlowpan/sixlowip.h"
 
 typedef struct __attribute__ ((packed)) tcp_mms_o_t
 	{

diff --git a/sys/net/destiny/tcp_hc.c b/sys/net/destiny/tcp_hc.c
@@ -12,8 +12,8 @@
 #include "tcp_hc.h"
 #include "socket.h"
 #include "tcp.h"
-#include "sys/net/sixlowpan/sixlowip.h"
-#include "sys/net/net_help/net_help.h"
+#include "../sixlowpan/sixlowip.h"
+#include "../net_help/net_help.h"
 
 #ifdef TCP_HC
 

diff --git a/sys/net/destiny/tcp_hc.h b/sys/net/destiny/tcp_hc.h
@@ -9,7 +9,7 @@
 #define TCP_HC_H_
 
 #include "tcp.h"
-#include "sys/net/sixlowpan/sixlowip.h"
+#include "../sixlowpan/sixlowip.h"
 #include "socket.h"
 
 #ifdef TCP_HC

diff --git a/sys/net/destiny/tcp_timer.c b/sys/net/destiny/tcp_timer.c
@@ -16,7 +16,7 @@
 #include "destiny.h"
 #include "socket.h"
 #include "net_help/msg_help.h"
-#include "sys/net/sixlowpan/sixlowpan.h"
+#include "../sixlowpan/sixlowpan.h"
 
 void handle_synchro_timeout(socket_internal_t *current_socket)
 	{

diff --git a/sys/net/destiny/udp.c b/sys/net/destiny/udp.c
@@ -5,12 +5,12 @@
 
 #include "udp.h"
 #include "msg.h"
-#include "sys/net/sixlowpan/sixlowip.h"
-#include "sys/net/sixlowpan/sixlowpan.h"
+#include "../sixlowpan/sixlowip.h"
+#include "../sixlowpan/sixlowpan.h"
 #include "socket.h"
 #include "in.h"
-#include "sys/net/net_help/net_help.h"
-#include "sys/net/net_help/msg_help.h"
+#include "../net_help/net_help.h"
+#include "../net_help/msg_help.h"
 
 uint16_t udp_csum(ipv6_hdr_t *ipv6_header, udp_hdr_t *udp_header)
 	{

diff --git a/sys/net/destiny/udp.h b/sys/net/destiny/udp.h
@@ -12,7 +12,7 @@
 
 #define UDP_STACK_SIZE 				512
 
-#include "sys/net/sixlowpan/sixlowip.h"
+#include "../sixlowpan/sixlowip.h"
 
 typedef struct __attribute__ ((packed)) udp_h_t{
     uint16_t src_port;