X-Git-Url: http://git.ieval.ro/?p=fdkaac.git;a=blobdiff_plain;f=src%2Fcompat_win32.c;h=4e3776c06841beff6d54eae4a49d13769a5ec3d1;hp=23edd9170d5403f0a6f6025d1e934881cf7760ce;hb=ffc230a83edf094dfa39a11afe2febdee498e48e;hpb=7b1f2136183f13cfdc83cc387134688ad07325f5 diff --git a/src/compat_win32.c b/src/compat_win32.c index 23edd91..4e3776c 100644 --- a/src/compat_win32.c +++ b/src/compat_win32.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "compat.h" #define WIN32_LEAN_AND_MEAN @@ -30,8 +31,13 @@ int __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, _startupinfo *); int64_t aacenc_timer(void) { +#if HAVE_STRUCT___TIMEB64 struct __timeb64 tv; _ftime64(&tv); +#else + struct timeb tv; + ftime(&tv); +#endif return (int64_t)tv.time * 1000 + tv.millitm; } @@ -66,9 +72,12 @@ FILE *aacenc_fopen(const char *name, const char *mode) fp = (mode[0] == 'r') ? stdin : stdout; _setmode(_fileno(fp), _O_BINARY); } else { + int share = _SH_DENYRW; + if (strchr(mode, 'r') && !strchr(mode, '+')) + share = _SH_DENYWR; codepage_decode_wchar(CP_UTF8, name, &wname); codepage_decode_wchar(CP_UTF8, mode, &wmode); - fp = _wfopen(wname, wmode); + fp = _wfsopen(wname, wmode, share); free(wname); free(wmode); }