summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-16 02:40:46 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-16 02:40:46 +0000
commitd6f2064fa166cf9df4da17e34dcef4210042e8f5 (patch)
treea3035cc769996b997a8e696c72360521015172c5 /src
parentb02aa7e922312db6a1f65f1396dfaef6b4768721 (diff)
downloadhercules-d6f2064fa166cf9df4da17e34dcef4210042e8f5.tar.gz
hercules-d6f2064fa166cf9df4da17e34dcef4210042e8f5.tar.bz2
hercules-d6f2064fa166cf9df4da17e34dcef4210042e8f5.tar.xz
hercules-d6f2064fa166cf9df4da17e34dcef4210042e8f5.zip
* Temperory fixed compiler warnings/errors. Please compile before commiting. [Lance]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6098 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/common/cbasetypes.h4
-rw-r--r--src/common/strlib.h1
-rw-r--r--src/map/clif.c4
-rw-r--r--src/mysql/my_global.h2
4 files changed, 9 insertions, 2 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 505eb6752..097b5241c 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -56,6 +56,7 @@
//////////////////////////////////////////////////////////////////////////
// useful typedefs
//////////////////////////////////////////////////////////////////////////
+#define HAVE_UCHAR
typedef unsigned char uchar;
typedef signed char schar;
typedef signed short sshort;
@@ -91,6 +92,9 @@ typedef int* pint;
//////////////////////////////
#ifdef WIN32
//////////////////////////////
+#define SIZEOF_LONG 4
+#define SIZEOF_INT 4
+#define HAVE_INT_8_16_32
typedef __int8 int8;
typedef __int16 int16;
typedef __int32 int32;
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 09eac0048..51d865149 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -12,6 +12,7 @@ char* jstrescapecpy (char* pt,char* spt);
int jmemescapecpy (char* pt,char* spt, int size);
#ifdef __WIN32
+#define HAVE_STRTOK_R
#define strtok_r(s,delim,save_ptr) _strtok_r((s),(delim),(save_ptr))
char *_strtok_r(char *s1, const char *s2, char **lasts);
#endif
diff --git a/src/map/clif.c b/src/map/clif.c
index 48216e412..c0304f7b6 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3800,7 +3800,7 @@ void clif_getareachar_item(struct map_session_data* sd,struct flooritem_data* fi
*/
int clif_getareachar_skillunit(struct map_session_data *sd,struct skill_unit *unit)
{
- int fd, unit_id;
+ int fd/*, unit_id*/; // Unused? [Lance]
struct block_list *bl;
fd=sd->fd;
@@ -3813,7 +3813,7 @@ int clif_getareachar_skillunit(struct map_session_data *sd,struct skill_unit *un
WFIFOL(fd, 2)=unit->bl.id;
WFIFOL(fd, 6)=unit->group->src_id;
WFIFOW(fd,10)=unit->bl.x;
- WFIFOW(fd,12)=unit_id;
+ WFIFOW(fd,12)=unit->bl.y; // might be typo? [Lance]
WFIFOB(fd,14)=unit->group->unit_id;
WFIFOB(fd,15)=1;
WFIFOB(fd,16)=1;
diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h
index 969617c08..2417477e2 100644
--- a/src/mysql/my_global.h
+++ b/src/mysql/my_global.h
@@ -93,6 +93,8 @@
#define NETWARE_SET_SCREEN_MODE(A)
#endif
+#include "../common/strlib.h"
+
/*
The macros below are borrowed from include/linux/compiler.h in the
Linux kernel. Use them to indicate the likelyhood of the truthfulness