From 41fd62105e0ccc376dde8266a66868c33dbe51c5 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 5 Jul 2014 00:11:17 +0000
Subject: [PATCH] Merged patch #252: Build failure on Mac OS X - conversion
 error in Source/util.cpp

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6513 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/util.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/util.cpp b/Source/util.cpp
index 28184d55..33c0b10a 100644
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -672,11 +672,11 @@ tstring get_executable_path(const TCHAR* argv0) {
   assert(rc != 0);
   return tstring(temp_buf);
 #elif __APPLE__
-  TCHAR temp_buf[MAXPATHLEN+1];
+  char temp_buf[MAXPATHLEN+1];
   unsigned int buf_len = MAXPATHLEN;
   int rc = Apple::_NSGetExecutablePath(temp_buf, &buf_len);
   assert(rc == 0);
-  return tstring(temp_buf);
+  return tstring(CtoTString(temp_buf));
 #else /* Linux/BSD/POSIX/etc */
   const TCHAR *envpath = _tgetenv(_T("_"));
   if( envpath != NULL )