| Index: include/share/win_utf8_io.h
|
| diff --git a/src/libFLAC/include/private/cpu.h b/include/share/win_utf8_io.h
|
| similarity index 56%
|
| copy from src/libFLAC/include/private/cpu.h
|
| copy to include/share/win_utf8_io.h
|
| index 651bb224f2a61f04adfbbdb8fe5601b225c33145..1d153392ae6207b02218f6921ff8802bf29f0ade 100644
|
| --- a/src/libFLAC/include/private/cpu.h
|
| +++ b/include/share/win_utf8_io.h
|
| @@ -1,5 +1,5 @@
|
| /* libFLAC - Free Lossless Audio Codec library
|
| - * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
|
| + * Copyright (C) 2013-2014 Xiph.Org Foundation
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -29,60 +29,41 @@
|
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef FLAC__PRIVATE__CPU_H
|
| -#define FLAC__PRIVATE__CPU_H
|
| +#ifdef _WIN32
|
|
|
| -#include "FLAC/ordinals.h"
|
| +#ifndef flac__win_utf8_io_h
|
| +#define flac__win_utf8_io_h
|
|
|
| -#ifdef HAVE_CONFIG_H
|
| -#include <config.h>
|
| +#ifdef __cplusplus
|
| +extern "C" {
|
| #endif
|
|
|
| -typedef enum {
|
| - FLAC__CPUINFO_TYPE_IA32,
|
| - FLAC__CPUINFO_TYPE_PPC,
|
| - FLAC__CPUINFO_TYPE_UNKNOWN
|
| -} FLAC__CPUInfo_Type;
|
| +#include <stdio.h>
|
| +#include <sys/stat.h>
|
| +#include <stdarg.h>
|
| +#include <windows.h>
|
|
|
| -typedef struct {
|
| - FLAC__bool cpuid;
|
| - FLAC__bool bswap;
|
| - FLAC__bool cmov;
|
| - FLAC__bool mmx;
|
| - FLAC__bool fxsr;
|
| - FLAC__bool sse;
|
| - FLAC__bool sse2;
|
| - FLAC__bool sse3;
|
| - FLAC__bool ssse3;
|
| - FLAC__bool _3dnow;
|
| - FLAC__bool ext3dnow;
|
| - FLAC__bool extmmx;
|
| -} FLAC__CPUInfo_IA32;
|
| +int get_utf8_argv(int *argc, char ***argv);
|
|
|
| -typedef struct {
|
| - FLAC__bool altivec;
|
| - FLAC__bool ppc64;
|
| -} FLAC__CPUInfo_PPC;
|
| +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);
|
|
|
| -typedef struct {
|
| - FLAC__bool use_asm;
|
| - FLAC__CPUInfo_Type type;
|
| - union {
|
| - FLAC__CPUInfo_IA32 ia32;
|
| - FLAC__CPUInfo_PPC ppc;
|
| - } data;
|
| -} FLAC__CPUInfo;
|
| +FILE *fopen_utf8(const char *filename, const char *mode);
|
| +int stat_utf8(const char *path, struct stat *buffer);
|
| +int _stat64_utf8(const char *path, struct __stat64 *buffer);
|
| +int chmod_utf8(const char *filename, int pmode);
|
| +int utime_utf8(const char *filename, struct utimbuf *times);
|
| +int unlink_utf8(const char *filename);
|
| +int rename_utf8(const char *oldname, const char *newname);
|
| +size_t strlen_utf8(const char *str);
|
| +int win_get_console_width(void);
|
| +int print_console(FILE *stream, const wchar_t *text, size_t len);
|
| +HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
|
|
|
| -void FLAC__cpu_info(FLAC__CPUInfo *info);
|
| -
|
| -#ifndef FLAC__NO_ASM
|
| -#ifdef FLAC__CPU_IA32
|
| -#ifdef FLAC__HAS_NASM
|
| -FLAC__uint32 FLAC__cpu_have_cpuid_asm_ia32(void);
|
| -void FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx);
|
| -FLAC__uint32 FLAC__cpu_info_extended_amd_asm_ia32(void);
|
| -#endif
|
| -#endif
|
| +#ifdef __cplusplus
|
| +} /* extern "C" */
|
| #endif
|
|
|
| #endif
|
| +#endif
|
|
|