From b312e82a6f660481c7c43b695452f6bcc0917c27 Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 1 Apr 2006 06:02:43 +0000
Subject: Asssuming only __WIN32 (VC++) doesn't have strtok_r.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5839 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/strlib.c   | 4 ++--
 src/common/strlib.h   | 6 +++---
 src/mysql/my_global.h | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/common/strlib.c b/src/common/strlib.c
index c2c2ae1ac..94f815839 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -137,8 +137,8 @@ char *trim(char *str, const char *delim)
 	return str;
 }
 
-#if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
-char *athena_strtok_r(char *s1, const char *s2, char **lasts)
+#ifdef __WIN32
+char *_strtok_r(char *s1, const char *s2, char **lasts)
 {
 	char *ret;
 
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 7eb167057..09eac0048 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -11,9 +11,9 @@ char* jstrescape (char* pt);
 char* jstrescapecpy (char* pt,char* spt);
 int jmemescapecpy (char* pt,char* spt, int size);
 
-#if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
-#define strtok_r(s,delim,save_ptr) athena_strtok_r((s),(delim),(save_ptr))
-char *athena_strtok_r(char *s1, const char *s2, char **lasts);
+#ifdef __WIN32
+#define strtok_r(s,delim,save_ptr) _strtok_r((s),(delim),(save_ptr))
+char *_strtok_r(char *s1, const char *s2, char **lasts);
 #endif
 
 // custom functions
diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h
index 6c3937467..0fbb96f59 100644
--- a/src/mysql/my_global.h
+++ b/src/mysql/my_global.h
@@ -658,7 +658,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define SET_STACK_SIZE(X)	/* Not needed on real machines */
 
 #if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
-#include "../common/strlib.h"
+	#ifdef __WIN32
+		#include "../common/strlib.h"
+	#else
+		#define strtok_r(A,B,C) strtok((A),(B))
+	#endif
 #endif
 
 /* Remove some things that mit_thread break or doesn't support */
-- 
cgit v1.2.3-70-g09d2