diff options
| author | wm4 <wm4@nowhere> | 2015-08-01 20:51:52 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-08-01 21:09:11 +0200 |
| commit | 41101c2996262c47757bc3bbf39cc11bd7dc5f99 (patch) | |
| tree | 2add0f03bfd0a318880b9de5888f2ff264ad82d6 /audio/out/ao_dsound.c | |
| parent | fefac2c941149fb49bcb5126060be74494d0c287 (diff) | |
| download | mpv-41101c2996262c47757bc3bbf39cc11bd7dc5f99.tar.bz2 mpv-41101c2996262c47757bc3bbf39cc11bd7dc5f99.tar.xz | |
win32: revert wchar_t changes
Revert "win32: more wchar_t -> WCHAR replacements"
Revert "win32: replace wchar_t with WCHAR"
Doing a "partial" port of this makes no sense anymore from my
perspective. Revert the changes, as they're confusing without
context, maintenance, and progress. These changes were a bit
premature anyway, and might actually cause other issues
(locale neutrality etc. as it was pointed out).
Diffstat (limited to 'audio/out/ao_dsound.c')
| -rw-r--r-- | audio/out/ao_dsound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 6aae40ce53..c581bf512e 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -174,7 +174,7 @@ static BOOL CALLBACK DirectSoundEnum(LPGUID guid, LPCSTR desc, LPCSTR module, } char *guidstr = talloc_strdup(NULL, ""); if (guid) { - WCHAR guidwstr[80] = {0}; + wchar_t guidwstr[80] = {0}; StringFromGUID2(guid, guidwstr, MP_ARRAY_SIZE(guidwstr)); char *nstr = mp_to_utf8(NULL, guidwstr); if (nstr) { @@ -227,7 +227,7 @@ static int LoadDirectSound(struct ao *ao) struct priv *p = ao->priv; // initialize directsound - p->hdsound_dll = LoadLibraryW(u"DSOUND.DLL"); + p->hdsound_dll = LoadLibrary(L"DSOUND.DLL"); if (p->hdsound_dll == NULL) { MP_ERR(ao, "cannot load DSOUND.DLL\n"); return 0; |