commit 27965ce3c99c79ed4e2ea3d453a2fabb44eb2646
author Olaf Bergmann <bergmann@tzi.org> Mon Feb 27 11:56:51 2017 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Mon Feb 27 11:56:51 2017 -0500
tree df968cc1e866a80f7378461220617d4bc083ef6e
parent 9f52b8bf829379d375f2dd396d542378e8dc20d1
parent 99879a558f8f023dd21738cf3f3089a1af3a12de

Merge "Makefile.tinydtls: fixup dtls_debug.c path"

ecc/testecc.c

diff --git a/ecc/testecc.c b/ecc/testecc.c
index b36d46b..205d254 100644
--- a/ecc/testecc.c
+++ b/ecc/testecc.c
@@ -195,9 +195,9 @@
 }
 
 #ifdef CONTIKI
-PROCESS(ecc_filed_test, "ECC test");
-AUTOSTART_PROCESSES(&ecc_filed_test);
-PROCESS_THREAD(ecc_filed_test, ev, d)
+PROCESS(ecc_test, "ECC test");
+AUTOSTART_PROCESSES(&ecc_test);
+PROCESS_THREAD(ecc_test, ev, d)
 {
 	PROCESS_BEGIN();
 

ecc/testfield.c

diff --git a/ecc/testfield.c b/ecc/testfield.c
index 30a690e..da9230e 100644
--- a/ecc/testfield.c
+++ b/ecc/testfield.c
@@ -237,9 +237,9 @@
 // }
 
 #ifdef CONTIKI
-PROCESS(ecc_filed_test, "ECC field test");
-AUTOSTART_PROCESSES(&ecc_filed_test);
-PROCESS_THREAD(ecc_filed_test, ev, d)
+PROCESS(ecc_field_test, "ECC field test");
+AUTOSTART_PROCESSES(&ecc_field_test);
+PROCESS_THREAD(ecc_field_test, ev, d)
 {
 	PROCESS_BEGIN();
 

global.h

diff --git a/global.h b/global.h
index c2ce904..dd3a77f 100644
--- a/global.h
+++ b/global.h
@@ -136,6 +136,7 @@
 }
 #endif /* HAVE_FLS */
 
+#undef uthash_fatal
 #define uthash_fatal(msg) return(-1) /* fatal error in uthash */
 
 #endif /* _DTLS_GLOBAL_H_ */