diff options
| author | Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 12:50:24 +0000 |
|---|---|---|
| committer | Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 12:50:24 +0000 |
| commit | 5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (patch) | |
| tree | 1f546bf12a99017b41ae2fd90e0ac452f97b0282 /src/common/strlib.h | |
| parent | b4208257ea0906e375024f811d8e51208d539d35 (diff) | |
| download | hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.gz hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.bz2 hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.xz hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.zip | |
* Merged changes from trunk [14688:14739/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/strlib.h')
| -rw-r--r-- | src/common/strlib.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h index 23f1e191a..3f4f984cf 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -9,6 +9,10 @@ #endif #include <stdarg.h> +#define __USE_GNU // required to enable strnlen on some platforms +#include <string.h> +#undef __USE_GNU + char* jstrescape (char* pt); char* jstrescapecpy (char* pt, const char* spt); int jmemescapecpy (char* pt, const char* spt, int size); @@ -24,7 +28,7 @@ const char *stristr(const char *haystack, const char *needle); char* _strtok_r(char* s1, const char* s2, char** lasts); #endif -#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(CYGWIN) +#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN) size_t strnlen (const char* string, size_t maxlen); #endif |