summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-19 21:07:43 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-19 21:07:43 +0000
commit9c8a86940f666a4a059195691a872f04ff1f414a (patch)
tree1b34503789691d315a9f070e28d4ff2e1043160c
parent17f0f15706cebb77c4ffe236ae1ace6233c3800f (diff)
downloadhercules-9c8a86940f666a4a059195691a872f04ff1f414a.tar.gz
hercules-9c8a86940f666a4a059195691a872f04ff1f414a.tar.bz2
hercules-9c8a86940f666a4a059195691a872f04ff1f414a.tar.xz
hercules-9c8a86940f666a4a059195691a872f04ff1f414a.zip
* Fixed gcc compile warnings in char-server and console plug-in (bugreport:4771, topic:208746, since r9631 and r14700).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14716 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/char.c2
-rw-r--r--src/char_sql/char.c4
-rw-r--r--src/plugins/console.c6
4 files changed, 6 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 57f841916..8c899e845 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/02/19
+ * Fixed gcc compile warnings in char-server and console plug-in (bugreport:4771, topic:208746, since r9631 and r14700). [Ai4rei]
* Fixed buying stores could be opened and sold to regardless of distance between seller and buyer (since r14713). [Ai4rei]
* Fixed 'feature.conf' not getting loaded and a typo buying store feature setting name (follow up to r14713). [Ai4rei]
* Implemented buying store system (aka. reverse vending, purchase shop) together with related skill and items, without NPCs. [Ai4rei]
diff --git a/src/char/char.c b/src/char/char.c
index a4bd3d6ed..b499faf96 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -541,7 +541,7 @@ int mmo_char_tostr(char *str, struct mmo_charstatus *p, struct global_reg *reg,
p->last_point.map, p->last_point.x, p->last_point.y, //
p->save_point.map, p->save_point.x, p->save_point.y,
p->partner_id,p->father,p->mother,p->child,p->fame, //
- TOL(p->delete_date)); // FIXME: platform-dependent size
+ (unsigned long)p->delete_date); // FIXME: platform-dependent size
for(i = 0; i < MAX_MEMOPOINTS; i++)
if (p->memo_point[i].map) {
str_p += sprintf(str_p, "%d,%d,%d ", p->memo_point[i].map, p->memo_point[i].x, p->memo_point[i].y);
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index ee73606ef..e135fee78 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -493,7 +493,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom,
mapindex_id2name(p->last_point.map), p->last_point.x, p->last_point.y,
mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, p->rename,
- TOL(p->delete_date), // FIXME: platform-dependent size
+ (unsigned long)p->delete_date, // FIXME: platform-dependent size
p->account_id, p->char_id) )
{
Sql_ShowDebug(sql_handle);
@@ -3076,7 +3076,7 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
// success
delete_date = time(NULL)+char_del_delay;
- if( SQL_SUCCESS != Sql_Query(sql_handle, "UPDATE `%s` SET `delete_date`='%lu' WHERE `char_id`='%d'", char_db, TOL(delete_date), char_id) )
+ if( SQL_SUCCESS != Sql_Query(sql_handle, "UPDATE `%s` SET `delete_date`='%lu' WHERE `char_id`='%d'", char_db, (unsigned long)delete_date, char_id) )
{
Sql_ShowDebug(sql_handle);
char_delete2_ack(fd, char_id, 3, 0);
diff --git a/src/plugins/console.c b/src/plugins/console.c
index b1307f863..bf1a133ca 100644
--- a/src/plugins/console.c
+++ b/src/plugins/console.c
@@ -34,8 +34,7 @@
do{ \
DWORD dwThreadId; \
buf.worker = CreateThread(NULL, 0, worker_ ## name, NULL, CREATE_SUSPENDED, &dwThreadId); \
- if( errvar ) \
- *errvar = ( buf.worker == NULL ); \
+ *(errvar) = ( buf.worker == NULL ); \
}while(0)
/// Buffer for asynchronous input
@@ -61,8 +60,7 @@ typedef struct _buffer {
if( pid == 0 ){ \
worker_ ## name(); \
} \
- if( errvar ) \
- *errvar = (pid == -1); \
+ *(errvar) = (pid == -1); \
}while(0)
#define PIPE_READ 0