Merge pull request #89 from gregslomin/esp8266

Fix for undefined reference to strtok_r
esp8266 · Apr 21, 2015 · 2edc522 · 2edc522
2 parents ec4f53e + 208a068
commit 2edc522
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/libc_replacements.c b/hardware/esp8266com/esp8266/cores/esp8266/libc_replacements.c
@@ -159,9 +159,6 @@ char* ICACHE_FLASH_ATTR strncat(char * dest, const char * src, size_t n) {
     return dest;
 }
 
-char* ICACHE_FLASH_ATTR strtok(char * str, const char * delimiters) {
-    return strtok_r(str, delimiters, NULL);
-}
 
 char* ICACHE_FLASH_ATTR strtok_r(char * str, const char * delimiters, char ** temp) {
     static char * ret = NULL;
@@ -205,6 +202,10 @@ char* ICACHE_FLASH_ATTR strtok_r(char * str, const char * delimiters, char ** te
     return ret;
 }
 
+char* ICACHE_FLASH_ATTR strtok(char * str, const char * delimiters) {
+    return strtok_r(str, delimiters, NULL);
+}
+
 int strcasecmp(const char * str1, const char * str2) {
     int d = 0;
     while(1) {