From 3c48bb1a20a207eb04edfe366892d001bffe7e16 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 28 Sep 2008 15:02:55 +0000
Subject: Fixing the txt-char converter compilation (bugreport:2171).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13245 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/char_sql/int_mercenary.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/char_sql')

diff --git a/src/char_sql/int_mercenary.c b/src/char_sql/int_mercenary.c
index b6c4d6313..dfb6dd880 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
-- 
cgit v1.2.3-60-g2f50