From a50db459091ccf8a7c18e0cb9bb384e3d4ede426 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 12 Sep 2013 14:33:37 +0200 Subject: [PATCH 1/5] added header for msp430 to define missing ssize_t --- cpu/msp430-common/include/cpu.h | 1 + cpu/msp430-common/include/msp430_types.h | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 cpu/msp430-common/include/msp430_types.h diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430-common/include/cpu.h index 366966becf..3d68d94509 100644 --- a/cpu/msp430-common/include/cpu.h +++ b/cpu/msp430-common/include/cpu.h @@ -26,6 +26,7 @@ License. See the file LICENSE in the top level directory for more details. #include #include #include +#include #include #define WORDSIZE 16 diff --git a/cpu/msp430-common/include/msp430_types.h b/cpu/msp430-common/include/msp430_types.h new file mode 100644 index 0000000000..0ed3d04d0a --- /dev/null +++ b/cpu/msp430-common/include/msp430_types.h @@ -0,0 +1,7 @@ +#ifndef MSP430_TYPES_H +#define MSP430_TYPES_H + +/** defining signed type for size_t */ +typedef int ssize_t; + +#endif /* MSP430_TYPES_H */ From b26153dba970123cc9cb2e39c86b7e27bcd6e84e Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 12 Sep 2013 14:33:58 +0200 Subject: [PATCH 2/5] included cpu.h in destiny to provide ssize_t --- sys/net/destiny/socket.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/destiny/socket.h b/sys/net/destiny/socket.h index 7c47c84f7c..be8a554da7 100644 --- a/sys/net/destiny/socket.h +++ b/sys/net/destiny/socket.h @@ -25,6 +25,7 @@ #include "udp.h" #include "in.h" #include "ipv6.h" +#include "cpu.h" /* * POSIX compatibility From 43eea48d25e8eae851f0c6907041faa1c40eef15 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 12 Sep 2013 16:08:40 +0200 Subject: [PATCH 3/5] added define for calloc in msp430-common --- cpu/msp430-common/include/malloc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/cpu/msp430-common/include/malloc.h b/cpu/msp430-common/include/malloc.h index b0b811c66d..f465d2c11b 100644 --- a/cpu/msp430-common/include/malloc.h +++ b/cpu/msp430-common/include/malloc.h @@ -4,6 +4,7 @@ #include "oneway_malloc.h" #define malloc _malloc +#define calloc _calloc #define realloc _realloc #define free _free From a6a96c71100d437ec6d91b0e88391fa869b4b507 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 12 Sep 2013 16:09:18 +0200 Subject: [PATCH 4/5] added missing malloc includes --- sys/lib/hashtable.c | 2 +- sys/net/sixlowpan/icmp.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/lib/hashtable.c b/sys/lib/hashtable.c index 66b067faa7..43735b0f7a 100644 --- a/sys/lib/hashtable.c +++ b/sys/lib/hashtable.c @@ -5,7 +5,7 @@ #include #include #include -#include "oneway_malloc.h" +#include "malloc.h" #include "hashtable.h" #include "hashtable_private.h" diff --git a/sys/net/sixlowpan/icmp.c b/sys/net/sixlowpan/icmp.c index b3378cb953..b9c09b90df 100644 --- a/sys/net/sixlowpan/icmp.c +++ b/sys/net/sixlowpan/icmp.c @@ -21,6 +21,7 @@ #include #include +#include "malloc.h" #include "vtimer.h" #include "mutex.h" #include "sixlowpan/error.h" From 5f537c38ac81c54f80f515c9a5c420e4a9d9cfa6 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 12 Sep 2013 23:13:54 +0200 Subject: [PATCH 5/5] changed to _types.h definition for ssize_t --- cpu/msp430-common/include/msp430_types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpu/msp430-common/include/msp430_types.h b/cpu/msp430-common/include/msp430_types.h index 0ed3d04d0a..0cd6d5004f 100644 --- a/cpu/msp430-common/include/msp430_types.h +++ b/cpu/msp430-common/include/msp430_types.h @@ -1,7 +1,9 @@ #ifndef MSP430_TYPES_H #define MSP430_TYPES_H +#include + /** defining signed type for size_t */ -typedef int ssize_t; +typedef _ssize_t ssize_t; #endif /* MSP430_TYPES_H */