[Gemrb-commits] gemrb: branch master updated. v0.7.2-581-g69e50f8

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  69e50f807b19ea0f2ce5ad6937e5ca2abb2b117f (commit)

Summary of changes:
 gemrb/plugins/TTFImporter/TTFFont.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
      from  30a1d7550c3be92a20c1b1cc90ace4cb9e6f0375 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=69e50f807b19ea0f2ce5ad6937e5ca2abb2b117f

commit 69e50f807b19ea0f2ce5ad6937e5ca2abb2b117f
Author: Brad Allred <bra...@me...>
Date:   Mon Jan 28 09:50:45 2013 -0700

    TTF: attempt to fix compiling for freebsd

diff --git a/gemrb/plugins/TTFImporter/TTFFont.cpp b/gemrb/plugins/TTFImporter/TTFFont.cpp
index 0659b15..1852131 100644
--- a/gemrb/plugins/TTFImporter/TTFFont.cpp
+++ b/gemrb/plugins/TTFImporter/TTFFont.cpp
@@ -47,8 +47,11 @@ const Sprite2D* TTFFont::GetCharSprite(ieWord chr) const
 	// TODO: make this work on BE systems
 	// TODO: maybe we want to work witn non-unicode fonts?
 	iconv_t cd = iconv_open("UTF-16LE", core->TLKEncoding.c_str());
+#if __FreeBSD__
+	int ret = iconv(cd, (const char **)&oldchar, &in, &newchar, &out);
+#else
 	int ret = iconv(cd, &oldchar, &in, &newchar, &out);
-
+#endif
 	if (ret != GEM_OK) {
 		Log(ERROR, "FONT", "iconv error: %d", errno);
 	}

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator