claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename all 'utf8_io' -> 'win_utf8_io'.

Browse Source
This commit is contained in:
Erik de Castro Lopo
2013-03-22 18:18:14 +11:00
parent 5705b4d7b2
commit 608e246f52
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FLAC.sln
View File

@@ -158,7 +158,7 @@ EndProject
Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "utf8_static", "src\share\utf8\utf8_static.vcproj", "{4cefbc92-c215-11db-8314-0800200c9a66}" Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "utf8_static", "src\share\utf8\utf8_static.vcproj", "{4cefbc92-c215-11db-8314-0800200c9a66}"
EndProject EndProject
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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
include/share/compat.h
View File

@@ -142,7 +142,7 @@
#endif /* defined _MSC_VER */ #endif /* defined _MSC_VER */
#ifdef FLAC__STRINGS_IN_UTF8 /* all char* strings are in UTF-8 format. Added to support Unicode files on Windows */ #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_printf printf_utf8
#define flac_fprintf fprintf_utf8 #define flac_fprintf fprintf_utf8

4
include/share/utf8_io.h → include/share/win_utf8_io.h
View File

@@ -1,7 +1,7 @@
#ifdef FLAC__STRINGS_IN_UTF8 #ifdef FLAC__STRINGS_IN_UTF8
#ifndef flac__utf8_io_h #ifndef flac__win_utf8_io_h
#define flac__utf8_io_h #define flac__win_utf8_io_h
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
src/share/utf8_io/utf8_io.c → src/share/win_utf8_io/win_utf8_io.c
View File

@@ -9,6 +9,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <windows.h> /* for WideCharToMultiByte and MultiByteToWideChar */ #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 */ /* convert WCHAR stored Unicode string to UTF-8. Caller is responsible for freeing memory */
char *utf8_from_wchar(const wchar_t *wstr) char *utf8_from_wchar(const wchar_t *wstr)
{ {

8
src/share/utf8_io/utf8_io.vcproj → src/share/win_utf8_io/win_utf8_io.vcproj
View File

@@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="utf8_io" Name="win_utf8_io"
ProjectGUID="{4cefbe02-c215-11db-8314-0800200c9a66}" ProjectGUID="{4cefbe02-c215-11db-8314-0800200c9a66}"
RootNamespace="utf8_io" RootNamespace="win_utf8_io"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@@ -222,7 +222,7 @@
Name="Public Header Files" Name="Public Header Files"
> >
<File <File
RelativePath="..\..\..\include\share\utf8_io.h" RelativePath="..\..\..\include\share\win_utf8_io.h"
> >
</File> </File>
</Filter> </Filter>
@@ -232,7 +232,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\utf8_io.c" RelativePath=".\win_utf8_io.c"
> >
</File> </File>
</Filter> </Filter>