diff options
author | lvqcl <lvqcl.mail@gmail.com> | 2018-08-25 10:23:39 +0300 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2018-08-25 18:55:30 +1000 |
commit | edfbe3cf194768af2f4c3cfd5cb5a6a273f63964 (patch) | |
tree | cf27f168aa05a39f987f26800d333ddcd2c5fc33 /include | |
parent | cdb030cd3749b4547399a049ce3cae5e974ccd48 (diff) | |
download | flac-edfbe3cf194768af2f4c3cfd5cb5a6a273f63964.tar.gz |
Move CreateFile_utf8 function to a more logical place
Diffstat (limited to 'include')
-rw-r--r-- | include/share/grabbag/file.h | 5 | ||||
-rw-r--r-- | include/share/win_utf8_io.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/share/grabbag/file.h b/include/share/grabbag/file.h index 7bc851af..b3f41484 100644 --- a/include/share/grabbag/file.h +++ b/include/share/grabbag/file.h @@ -58,11 +58,6 @@ FLAC__bool grabbag__file_remove_file(const char *filename); FILE *grabbag__file_get_binary_stdin(void); FILE *grabbag__file_get_binary_stdout(void); -#if defined _WIN32 && !defined __CYGWIN__ -#include <windows.h> -HANDLE WINAPI grabbag__CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); -#endif - #ifdef __cplusplus } #endif diff --git a/include/share/win_utf8_io.h b/include/share/win_utf8_io.h index 13fd1186..6031b898 100644 --- a/include/share/win_utf8_io.h +++ b/include/share/win_utf8_io.h @@ -50,6 +50,9 @@ int printf_utf8(const char *format, ...); int fprintf_utf8(FILE *stream, const char *format, ...); int vfprintf_utf8(FILE *stream, const char *format, va_list argptr); +#include <windows.h> +HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); + #ifdef __cplusplus } /* extern "C" */ #endif |