From 608e246f5215a96756616b5f23e82d588e2f29b9 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Fri, 22 Mar 2013 18:18:14 +1100
Subject: [PATCH] Rename all 'utf8_io' -> 'win_utf8_io'.

---
 FLAC.sln                                                          | 2 +-
 include/share/compat.h                                            | 2 +-
 include/share/{utf8_io.h => win_utf8_io.h}                        | 4 ++--
 src/share/{utf8_io/utf8_io.c => win_utf8_io/win_utf8_io.c}        | 2 ++
 .../{utf8_io/utf8_io.vcproj => win_utf8_io/win_utf8_io.vcproj}    | 8 ++++----
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename include/share/{utf8_io.h => win_utf8_io.h} (93%)
 rename src/share/{utf8_io/utf8_io.c => win_utf8_io/win_utf8_io.c} (99%)
 rename src/share/{utf8_io/utf8_io.vcproj => win_utf8_io/win_utf8_io.vcproj} (92%)

diff --git a/FLAC.sln b/FLAC.sln
index c988415..202f84b 100644
--- a/FLAC.sln
+++ b/FLAC.sln
@@ -158,7 +158,7 @@ EndProject
 Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "utf8_static", "src\share\utf8\utf8_static.vcproj", "{4cefbc92-c215-11db-8314-0800200c9a66}"
 EndProject
 EndProject
-Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "utf8_io", "src\share\utf8_io\utf8_io.vcproj", "{4cefbe02-c215-11db-8314-0800200c9a66}"
+Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "win_utf8_io", "src\share\win_utf8_io\win_utf8_io.vcproj", "{4cefbe02-c215-11db-8314-0800200c9a66}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/include/share/compat.h b/include/share/compat.h
index 5c9f328..7ef2755 100644
--- a/include/share/compat.h
+++ b/include/share/compat.h
@@ -142,7 +142,7 @@
 #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
diff --git a/include/share/utf8_io.h b/include/share/win_utf8_io.h
similarity index 93%
rename from include/share/utf8_io.h
rename to include/share/win_utf8_io.h
index 1b8988a..caf7cf9 100644
--- a/include/share/utf8_io.h
+++ b/include/share/win_utf8_io.h
@@ -1,7 +1,7 @@
 #ifdef FLAC__STRINGS_IN_UTF8
 
-#ifndef flac__utf8_io_h
-#define flac__utf8_io_h
+#ifndef flac__win_utf8_io_h
+#define flac__win_utf8_io_h
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/share/utf8_io/utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c
similarity index 99%
rename from src/share/utf8_io/utf8_io.c
rename to src/share/win_utf8_io/win_utf8_io.c
index 8bae43e..0699f19 100644
--- a/src/share/utf8_io/utf8_io.c
+++ b/src/share/win_utf8_io/win_utf8_io.c
@@ -9,6 +9,8 @@
 #include <stdarg.h>
 #include <windows.h> /* for WideCharToMultiByte and MultiByteToWideChar */
 
+#include "share/win_utf8_io.h"
+
 /* convert WCHAR stored Unicode string to UTF-8. Caller is responsible for freeing memory */
 char *utf8_from_wchar(const wchar_t *wstr)
 {
diff --git a/src/share/utf8_io/utf8_io.vcproj b/src/share/win_utf8_io/win_utf8_io.vcproj
similarity index 92%
rename from src/share/utf8_io/utf8_io.vcproj
rename to src/share/win_utf8_io/win_utf8_io.vcproj
index c63aeb7..0eacf40 100644
--- a/src/share/utf8_io/utf8_io.vcproj
+++ b/src/share/win_utf8_io/win_utf8_io.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="utf8_io"
+	Name="win_utf8_io"
 	ProjectGUID="{4cefbe02-c215-11db-8314-0800200c9a66}"
-	RootNamespace="utf8_io"
+	RootNamespace="win_utf8_io"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -222,7 +222,7 @@
 			Name="Public Header Files"
 			>
 			<File
-				RelativePath="..\..\..\include\share\utf8_io.h"
+				RelativePath="..\..\..\include\share\win_utf8_io.h"
 				>
 			</File>
 		</Filter>
@@ -232,7 +232,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\utf8_io.c"
+				RelativePath=".\win_utf8_io.c"
 				>
 			</File>
 		</Filter>
-- 
2.7.4