From 4685e88de8ed52ea3537c22c09393fd818e7f50a Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 30 May 2019 12:01:55 +0200
Subject: [PATCH] msvcrt/tests: Don't use win_skip for functions that are not
 exported on 64-bit.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/msvcrt/tests/data.c    | 3 +--
 dlls/msvcrt/tests/environ.c | 4 ++--
 dlls/msvcrt/tests/locale.c  | 2 +-
 dlls/msvcrt/tests/time.c    | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c
index 9aacac7b503..b0acc60b20b 100644
--- a/dlls/msvcrt/tests/data.c
+++ b/dlls/msvcrt/tests/data.c
@@ -153,9 +153,8 @@ static void test___getmainargs(void)
         new_argv = *p___p___argv();
         ok(new_argc == 4, "*__p___argc() = %d\n", new_argc);
         ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv);
-    }else {
-        win_skip("__p___argc or __p___argv is not available\n");
     }
+    else skip("__p___argc or __p___argv is not available\n");
 
     mode = 0;
     __getmainargs(&argc, &argv, &envp, 1, &mode);
diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c
index 11b79f0d7ca..b8e0ae6251a 100644
--- a/dlls/msvcrt/tests/environ.c
+++ b/dlls/msvcrt/tests/environ.c
@@ -97,7 +97,7 @@ static void test__environ(void)
             "Expected _environ pointers to be identical\n" );
     }
     else
-        win_skip( "__p__environ() is not available\n" );
+        skip( "__p__environ() is not available\n" );
 
     if (p_get_environ)
     {
@@ -163,7 +163,7 @@ static void test__wenviron(void)
             "Expected _wenviron pointers to be NULL\n" );
     }
     else
-        win_skip( "__p__wenviron() is not available\n" );
+        skip( "__p__wenviron() is not available\n" );
 
     if (p_get_wenviron)
     {
diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index ff777599aa2..08abac00bed 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -759,7 +759,7 @@ static void test___mb_cur_max_func(void)
 
     /* for older Windows */
     if (!p__p___mb_cur_max)
-        win_skip("Skipping __p___mb_cur_max tests\n");
+        skip("Skipping __p___mb_cur_max tests\n");
     else {
         mb_cur_max = *p__p___mb_cur_max();
         ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max);
diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index e9edb57c4e6..2b1c781b059 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -577,7 +577,7 @@ static void test_daylight(void)
 
     if (!p___p__daylight)
     {
-        win_skip("__p__daylight not available\n");
+        skip("__p__daylight not available\n");
         return;
     }
 
@@ -829,7 +829,7 @@ static void test__tzset(void)
     int ret;
 
     if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) {
-        win_skip("__p__daylight, __p__timezone or __p__dstbias is not available\n");
+        skip("__p__daylight, __p__timezone or __p__dstbias is not available\n");
         return;
     }