Merge branch 'master' into incoming

1 files changed, 6 insertions, 0 deletions

diff --git a/src/library.js b/src/library.js
index 1747155f..a665fc8f 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3843,6 +3843,12 @@ LibraryManager.library = {
     return 0;
   },
 
+  __strtok_state: 0,
+  strtok__deps: ['__strtok_state', 'strtok_r'],
+  strtok: function(s, delim) {
+    return _strtok_r(s, delim, ___strtok_state);
+  },
+
   // Translated from newlib; for the original source and licensing, see library_strtok_r.c
   strtok_r: function(s, delim, lasts) {
     var skip_leading_delim = 1;