diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-26 10:37:45 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-26 10:37:45 +0000 |
| commit | 49e9510c432987393d10ec1b8b1c2d416c9feb42 (patch) | |
| tree | 4d930ebf1094ad5972cb8ba20b89d12ce74d4f3c /src/common/strlib.h | |
| parent | fda87bd7ef5a71f4f5d5e604de1b15c58763efdd (diff) | |
| download | hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.tar.gz hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.tar.bz2 hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.tar.xz hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.zip | |
Adjusted eAthena code to compile cleanly in C++ mode.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12436 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/strlib.h')
| -rw-r--r-- | src/common/strlib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h index d1fb20d49..004fe6375 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -24,7 +24,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) +#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(CYGWIN) size_t strnlen (const char* string, size_t maxlen); #endif @@ -49,7 +49,7 @@ int strline(const char* str, size_t pos); /// Bitfield determining the behaviour of sv_parse. -enum e_svopt +typedef enum e_svopt { // default: no escapes and no line terminator SV_NOESCAPE_NOTERMINATE = 0, @@ -59,7 +59,7 @@ enum e_svopt SV_TERMINATE_LF = 2, SV_TERMINATE_CRLF = 4, SV_TERMINATE_CR = 8, -}; +} e_svopt; /// Other escape sequences supported by the C compiler. #define SV_ESCAPE_C_SUPPORTED "abtnvfr\?\"'\\" |