summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/char/char.c2
-rw-r--r--src/char_sql/char.c4
-rw-r--r--src/plugins/console.c6
3 files changed, 5 insertions, 7 deletions
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