commit d1ea35bfb7d3f7e6451029549e6875c51b735006
author Gaëtan Harter <gaetan.harter@inria.fr> Fri Dec 09 14:30:20 2016 +0100
committer Olaf Bergmann <bergmann@tzi.org> Mon Feb 27 18:05:10 2017 +0100
tree 65fd78b1514fcd1b753b0ba5b607745973f42c26
parent 080013fd2d70ab9c0b35094dd2afc1cb2747b7a9

contiki: set SHA2_USE_INTTYPES by default

Change-Id: If218a4c434663a008721340b8a11107f2e8a8d7d
Signed-off-by: Gaëtan Harter <gaetan.harter@inria.fr>

Makefile.tinydtls

diff --git a/Makefile.tinydtls b/Makefile.tinydtls
index 2a24a11..0f303f4 100644
--- a/Makefile.tinydtls
+++ b/Makefile.tinydtls
@@ -1,23 +1,15 @@
 # This is a -*- Makefile -*-
 
 ifeq ($(TARGET), redbee-econotag)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1 -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
+CFLAGS += -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
 endif
 
 ifeq ($(TARGET), wismote)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1 -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
+CFLAGS += -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
 endif
 
 ifeq ($(TARGET), exp5438)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1 -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
-endif
-
-ifeq ($(TARGET), native)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1
-endif
-
-ifeq ($(TARGET), minimal-net)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1
+CFLAGS += -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
 endif
 
 CFLAGS += -DDTLSv12 -DWITH_SHA256 

platform-specific/platform.h

diff --git a/platform-specific/platform.h b/platform-specific/platform.h
index fd3214a..5bc42a4 100644
--- a/platform-specific/platform.h
+++ b/platform-specific/platform.h
@@ -61,6 +61,10 @@
 /** do not use uthash hash tables */
 #define DTLS_PEERS_NOHASH 1
 
+#ifndef SHA2_USE_INTTYPES_H
+#define SHA2_USE_INTTYPES_H 1
+#endif
+
 /************************************************************************/
 /* Specific Contiki platforms                                           */
 /************************************************************************/