upgrade SDL to version 2.0.8

[platform/upstream/SDL.git] / test / testiconv.c

diff --git a/test/testiconv.c b/test/testiconv.c
index d4f500c..ae39ea2 100755 (executable)
--- a/test/testiconv.c
+++ b/test/testiconv.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -25,7 +25,7 @@ widelen(char *data)
     return len;
 }
 int
-SDL_main(int argc, char *argv[])
+main(int argc, char *argv[])
 {
     const char *formats[] = {
         "UTF8",
@@ -52,11 +52,11 @@ SDL_main(int argc, char *argv[])
     SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
 
     if (!argv[1]) {
-        argv[1] = "res/utf8.txt";
+        argv[1] = "./res/utf8.txt";
     }
     file = fopen(argv[1], "rb");
     if (!file) {
-        SDLTest_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to open %s\n", argv[1]);
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to open %s\n", argv[1]);
         return (1);
     }
 
@@ -71,7 +71,7 @@ SDL_main(int argc, char *argv[])
             test[0] = SDL_iconv_string(formats[i], "UCS-4", ucs4, len);
             test[1] = SDL_iconv_string("UCS-4", formats[i], test[0], len);
             if (!test[1] || SDL_memcmp(test[1], ucs4, len) != 0) {
-                SDLTest_LogError(SDL_LOG_CATEGORY_APPLICATION, "FAIL: %s\n", formats[i]);
+                SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "FAIL: %s\n", formats[i]);
                 ++errors;
             }
             SDL_free(test[0]);