From de25376177519cca45101ebb7a417e27c72da4ad Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 28 Sep 2008 15:02:55 +0000 Subject: [PATCH] Fixing the txt-char converter compilation (bugreport:2171). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13245 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/char_sql/int_mercenary.c | 3 +++ vcproj-8/txt-converter-char.vcproj | 24 ++++++++++++++++++++++++ vcproj-9/txt-converter-char.vcproj | 24 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/src/char_sql/int_mercenary.c b/src/char_sql/int_mercenary.c index b6c4d6313c..dfb6dd8805 100644 --- a/src/char_sql/int_mercenary.c +++ b/src/char_sql/int_mercenary.c @@ -136,6 +136,8 @@ bool mapif_mercenary_delete(int merc_id) return true; } +#ifndef TXT_SQL_CONVERT + static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag) { int size = sizeof(struct s_mercenary) + 5; @@ -216,3 +218,4 @@ int inter_mercenary_parse_frommap(int fd) } return 1; } +#endif //TXT_SQL_CONVERT diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj index a30463c220..91dfa8f039 100644 --- a/vcproj-8/txt-converter-char.vcproj +++ b/vcproj-8/txt-converter-char.vcproj @@ -374,6 +374,30 @@ RelativePath="..\src\char_sql\int_guild.h" > + + + + + + + + + + diff --git a/vcproj-9/txt-converter-char.vcproj b/vcproj-9/txt-converter-char.vcproj index 31a48cc8b8..329cd2f8d7 100644 --- a/vcproj-9/txt-converter-char.vcproj +++ b/vcproj-9/txt-converter-char.vcproj @@ -379,6 +379,30 @@ RelativePath="..\src\char_sql\int_guild.h" > + + + + + + + + + +