diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-02-05 11:02:44 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-02-08 22:04:12 +1100 |
| commit | d40a6bc695984ba0d35b795874f387f73cfadada (patch) | |
| tree | 5f28325bddf9272de4c4f85bc521e060845a4c0c /include | |
| parent | a5c8e8e14de182c4e8c5a8cd0b6be7c75ab6f021 (diff) | |
| download | flac-d40a6bc695984ba0d35b795874f387f73cfadada.tar.gz | |
libFLAC: Remove win_utf8_io dependency
Path-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/share/Makefile.am | 3 | ||||
| -rw-r--r-- | include/share/compat.h | 15 | ||||
| -rw-r--r-- | include/share/win_utf8_io.h | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/include/share/Makefile.am b/include/share/Makefile.am index a6a3ca0f..2d8ca503 100644 --- a/include/share/Makefile.am +++ b/include/share/Makefile.am @@ -14,4 +14,5 @@ EXTRA_DIST = \ replaygain_synthesis.h \ safe_str.h \ utf8.h \ - win_utf8_io.h + win_utf8_io.h \ + windows_unicode_filenames.h diff --git a/include/share/compat.h b/include/share/compat.h index 34d32db4..4332b5c3 100644 --- a/include/share/compat.h +++ b/include/share/compat.h @@ -146,18 +146,19 @@ #ifdef _WIN32 /* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */ -#include "share/win_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_chmod chmod_utf8 -#define flac_utime utime_utf8 -#define flac_unlink unlink_utf8 -#define flac_rename rename_utf8 -#define flac_stat _stat64_utf8 +#include "share/windows_unicode_filenames.h" +#define flac_fopen flac_internal_fopen_utf8 +#define flac_chmod flac_internal_chmod_utf8 +#define flac_utime flac_internal_utime_utf8 +#define flac_unlink flac_internal_unlink_utf8 +#define flac_rename flac_internal_rename_utf8 +#define flac_stat flac_internal_stat64_utf8 #else diff --git a/include/share/win_utf8_io.h b/include/share/win_utf8_io.h index ba9ad75c..5baefcce 100644 --- a/include/share/win_utf8_io.h +++ b/include/share/win_utf8_io.h @@ -34,15 +34,13 @@ #ifndef flac__win_utf8_io_h #define flac__win_utf8_io_h +#include <stdio.h> +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif -#include <stdio.h> -#include <sys/stat.h> -#include <stdarg.h> -#include <windows.h> - size_t strlen_utf8(const char *str); int win_get_console_width(void); |