X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fprefix.cpp;h=92409a7d2c3dc3aff3e60c7c89b9a8acff1eb221;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=8c1dd4f0022857dff53fef33a80e8c10f77c961b;hpb=fc619a4a231d691cde619438a5ad8c73126ba98e;p=inkscape.git 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);