aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/porting.h18
-rw-r--r--src/util/string.cpp25
-rw-r--r--src/util/string.h1
3 files changed, 39 insertions, 5 deletions
diff --git a/src/porting.h b/src/porting.h
index 184e1ab54..c8d19154c 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -42,18 +42,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifdef _WIN32
#include <windows.h>
- #define ALIGNOF(x) __alignof(x)
#define sleep_ms(x) Sleep(x)
+#else
+ #include <unistd.h>
+ #include <stdint.h> //for uintptr_t
+
+ #define sleep_ms(x) usleep(x*1000)
+#endif
+
+#ifdef _MSC_VER
+ #define ALIGNOF(x) __alignof(x)
#define strtok_r(x, y, z) strtok_s(x, y, z)
#define strtof(x, y) (float)strtod(x, y)
#define strtoll(x, y, z) _strtoi64(x, y, z)
#define strtoull(x, y, z) _strtoui64(x, y, z)
#else
- #include <unistd.h>
- #include <stdint.h> //for uintptr_t
-
#define ALIGNOF(x) __alignof__(x)
- #define sleep_ms(x) usleep(x*1000)
+#endif
+
+#ifdef __MINGW32__
+ #define strtok_r(x, y, z) mystrtok_r(x, y, z)
#endif
#define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1))
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 215ac299d..c10755ae1 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -47,3 +47,28 @@ size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void *userdata) {
stream->write(ptr, count);
return count;
}
+
+char *mystrtok_r(char *s, const char *sep, char **lasts) {
+ char *t;
+
+ if (!s)
+ s = *lasts;
+
+ while (*s && strchr(sep, *s))
+ s++;
+
+ if (!*s)
+ return NULL;
+
+ t = s;
+ while (*t) {
+ if (strchr(sep, *t)) {
+ *t++ = '\0';
+ break;
+ }
+ t++;
+ }
+
+ *lasts = t;
+ return s;
+}
diff --git a/src/util/string.h b/src/util/string.h
index 58274c677..d081b365b 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -283,6 +283,7 @@ inline std::string wrap_rows(const std::string &from, u32 rowlen)
std::string translatePassword(std::string playername, std::wstring password);
size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void *userdata);
+char *mystrtok_r(char *s, const char *sep, char **lasts);
#endif