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

@@ -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

vcproj-8/txt-converter-char.vcproj

@@ -374,6 +374,30 @@
 				RelativePath="..\src\char_sql\int_guild.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\char_sql\int_mercenary.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\char_sql\int_mercenary.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\char_sql\int_party.c"
 				>

vcproj-9/txt-converter-char.vcproj

@@ -379,6 +379,30 @@
 				RelativePath="..\src\char_sql\int_guild.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\char_sql\int_mercenary.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\char_sql\int_mercenary.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\char_sql\int_party.c"
 				>