diff --git a/ChangeLog b/ChangeLog index b97515c72..46e77a210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ * src/msgwindow.c: Add workaround for display problem in Message window: Truncate displayed string at 1024 bytes if it is longer. + * src/utils.c, src/win32.v: + Fix compile error on Windows. + Don't use _waccess_s since it seems to be unavailable in MingW32. 2008-01-06 Enrico Tröger diff --git a/src/utils.c b/src/utils.c index 34ea4f298..46d39acc5 100644 --- a/src/utils.c +++ b/src/utils.c @@ -741,10 +741,9 @@ gint utils_is_file_writeable(const gchar *locale_filename) ret = errno; else ret = 0; - +#endif g_free(file); return ret; -#endif } diff --git a/src/win32.c b/src/win32.c index 9615d1c0d..9f54463b7 100644 --- a/src/win32.c +++ b/src/win32.c @@ -561,7 +561,7 @@ gint win32_check_write_permission(const gchar *dir) { static wchar_t w_dir[512]; MultiByteToWideChar(CP_UTF8, 0, dir, -1, w_dir, sizeof w_dir); - if (_waccess_s(w_dir, R_OK | W_OK) != 0) + if (_waccess(w_dir, R_OK | W_OK) != 0) return errno; else return 0; @@ -630,7 +630,6 @@ static void debug_setup_console() fp = _fdopen(hConHandle, "w"); *stderr = *fp; setvbuf(stderr, NULL, _IONBF, 0); - }