Merge branch '2.3' into develop

2019-05-28 15:19:10 +03:00
parent 65c795164c dcdcc0e44f
commit 2ddc20cf9e
1 changed files with 1 additions and 1 deletions
--- a/server/modules/routing/avrorouter/rpl.cc
+++ b/server/modules/routing/avrorouter/rpl.cc
@ -1116,7 +1116,7 @@ const char* keywords[] =
    NULL
 };

-static bool token_is_keyword(const char* tok, int len)
+static bool token_is_keyword(const char* tok, size_t len)
 {
    for (int i = 0; keywords[i]; i++)
    {