From a870a3f925fe2dd16a60f48a956af772988b805b Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Sat, 3 Apr 2010 01:47:43 +0200
Subject: Fix command line invocation on Windows (LP #167455).

Fixed bugs:
  - https://launchpad.net/bugs/167455

(bzr r9281)
---
 src/prefix.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/prefix.cpp')

diff --git a/src/prefix.cpp b/src/prefix.cpp
index 8c1dd4f00..92409a7d2 100644
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -435,11 +435,11 @@ br_extract_prefix (const char *path)
 /**
  * Return the directory of the .exe that is currently running
  */
-static Glib::ustring win32_getExePath()
+Glib::ustring win32_getExePath()
 {
     gunichar2 path[2048];
-    GetModuleFileNameW(NULL, (WCHAR*) path, 2048);
-    gchar *exe = g_utf16_to_utf8(path, -1, NULL, NULL, NULL);
+    GetModuleFileNameW(0, (WCHAR*) path, 2048);
+    gchar *exe = g_utf16_to_utf8(path, -1, 0,0,0);
     gchar *dir = g_path_get_dirname(exe);
     Glib::ustring ret = dir;
     g_free(dir);
@@ -481,7 +481,7 @@ static Glib::ustring win32_getResourcePath(const Glib::ustring &childPath)
  */ 
 char *win32_relative_path(const char *childPath)
 {
-    static char *returnPath = NULL;
+    static char *returnPath = 0;
     if (!childPath)
         childPath = "";
     Glib::ustring resourcePath = win32_getResourcePath(childPath);
-- 
cgit v1.2.3