include/share/compat.h : Cleanup.

[platform/upstream/flac.git] / include / share / compat.h

diff --git a/include/share/compat.h b/include/share/compat.h
index 5c9f328..214990c 100644 (file)
--- a/include/share/compat.h
+++ b/include/share/compat.h
@@ -142,17 +142,17 @@
 #endif /* defined _MSC_VER */
 
 #ifdef FLAC__STRINGS_IN_UTF8 /* all char* strings are in UTF-8 format. Added to support Unicode files on Windows */
-#include "share/utf8_io.h"
+#include "share/win_utf8_io.h"
 
 #define flac_printf printf_utf8
 #define flac_fprintf fprintf_utf8
 #define flac_vfprintf vfprintf_utf8
 #define flac_fopen fopen_utf8
-#define flac_stat _stat64_utf8
 #define flac_chmod chmod_utf8
 #define flac_utime utime_utf8
 #define flac_unlink unlink_utf8
 #define flac_rename rename_utf8
+#define flac_stat _stat64_utf8
 
 #else
 
@@ -160,22 +160,24 @@
 #define flac_fprintf fprintf
 #define flac_vfprintf vfprintf
 #define flac_fopen fopen
+#define flac_chmod chmod
+#define flac_utime utime
+#define flac_unlink unlink
+#define flac_rename rename
+
 #ifdef _WIN32
 #define flac_stat _stat64
 #else
 #define flac_stat stat
 #endif
-#define flac_chmod chmod
-#define flac_utime utime
-#define flac_unlink unlink
-#define flac_rename rename
+
 #endif
 
 #ifdef _WIN32
-#define _flac_stat _stat64 /* stat struct */
+#define flac_stat_s _stat64 /* stat struct */
 #define flac_fstat _fstat64
 #else
-#define _flac_stat stat /* stat struct */
+#define flac_stat_s stat /* stat struct */
 #define flac_fstat fstat
 #endif