Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed warnings on compilers again.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5654 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-03-18 01:43:46 +00:00
parent 562a64fee0
commit 4c65151fb5
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/18
* Fixed warnings on compilers again. [Lance]
2006/03/17
* Fixed the mob_skill_db by commenting out lines with targeted skills
being cast during an idle state. (Thanks to LittleWolf) [Zephiris]

2
src/common/utils.c
View File

@ -101,7 +101,7 @@ int strcasecmp(const char *arg1, const char *arg2)
return (0);
}
int strncasecmp(const char *arg1, const char *arg2, int n)
int strncasecmp(const char *arg1, const char *arg2, size_t n)
{
int chk, i;

2
src/common/utils.h
View File

@ -15,7 +15,7 @@
/* strcasecmp -> stricmp -> str_cmp */
#if defined(_WIN32) && !defined(MINGW)
int strcasecmp(const char *arg1, const char *arg2);
int strncasecmp(const char *arg1, const char *arg2, int n);
int strncasecmp(const char *arg1, const char *arg2, size_t n);
void str_upper(char *name);
void str_lower(char *name);
char *rindex(char *str, char c);

13
src/mysql/my_global.h
View File

@ -779,8 +779,13 @@ typedef void *gptr; /* Generic pointer */
typedef char *gptr; /* Generic pointer */
#endif
#ifndef HAVE_INT_8_16_32
#ifndef WIN32
typedef signed char int8; /* Signed integer >= 8 bits */
typedef short int16; /* Signed integer >= 16 bits */
#else
typedef __int8 int8;
typedef __int16 int16;
#endif
#endif
#ifndef HAVE_UCHAR
typedef unsigned char uchar; /* Short for unsigned char */
@ -795,10 +800,18 @@ typedef int int32;
typedef unsigned int uint32; /* Short for unsigned integer >= 32 bits */
#elif SIZEOF_LONG == 4
#ifndef HAVE_INT_8_16_32
#ifndef WIN32
typedef long int32;
#else
typedef __int32 int32;
#endif
#endif
#ifndef WIN32
typedef unsigned long uint32; /* Short for unsigned integer >= 32 bits */
#else
typedef unsigned __int32 uint32;
#endif
#else
#error "Neither int or long is of 4 bytes width"
#endif