diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-08 19:47:26 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-08 19:47:26 +0000 |
| commit | 6fc804e12ad7db569e82229cc11a361066cec682 (patch) | |
| tree | ddfdf820c20e373e6666b6ae4428099702b47744 /src/common/strlib.c | |
| parent | 49a1de65bf592bbfe194a06b2b4c41f9865ea8b3 (diff) | |
| download | hercules-6fc804e12ad7db569e82229cc11a361066cec682.tar.gz hercules-6fc804e12ad7db569e82229cc11a361066cec682.tar.bz2 hercules-6fc804e12ad7db569e82229cc11a361066cec682.tar.xz hercules-6fc804e12ad7db569e82229cc11a361066cec682.zip | |
* Fix C++ compilation issues.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14955 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/strlib.c')
| -rw-r--r-- | src/common/strlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/strlib.c b/src/common/strlib.c index 097f499e6..7f79a5ef0 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -245,7 +245,7 @@ char* _strtok_r(char *s1, const char *s2, char **lasts) If no '\0' terminator is found in that many characters, return MAXLEN. */ size_t strnlen (const char* string, size_t maxlen) { - const char* end = memchr (string, '\0', maxlen); + const char* end = (const char*)memchr(string, '\0', maxlen); return end ? (size_t) (end - string) : maxlen; } #endif @@ -980,7 +980,7 @@ bool sv_readdb(const char* directory, const char* filename, char delim, int minc // allocate enough memory for the maximum requested amount of columns plus the reserved one fields_length = maxcols+1; - fields = aMalloc(fields_length*sizeof(char*)); + fields = (char**)aMalloc(fields_length*sizeof(char*)); // process rows one by one while( fgets(line, sizeof(line), fp) ) |