Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

1 files changed, 2 insertions, 2 deletions

diff --git a/win32/mingw.c b/win32/mingw.c
index 501c886e0..044d5c50f 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -943,11 +943,11 @@ char *win32_execable_file(const char *p)
         if ( (path=malloc(len+5)) != NULL ) {
                 memcpy(path, p, len);
                 memcpy(path+len, ".exe", 5);
-                if (execable_file(path)) {
+                if (file_is_executable(path)) {
                         return path;
                 }
                 memcpy(path+len, ".com", 5);
-                if (execable_file(path)) {
+                if (file_is_executable(path)) {
                         return path;
                 }
                 free(path);