summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-25 14:55:14 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-25 14:55:14 +0200
commit36dae0ee4485ec52cf727c33679ed315cd3d9c0a (patch)
tree391169d767ca63b81434f016cb59c90f4c04ec85 /loader
parentdeb95362577935bec836ffd1f2669f424c5d34c8 (diff)
parentaf6f08ce6ae77ecba16bea764ad3a193766e6d07 (diff)
downloadmpv-36dae0ee4485ec52cf727c33679ed315cd3d9c0a.tar.bz2
mpv-36dae0ee4485ec52cf727c33679ed315cd3d9c0a.tar.xz
Merge svn changes up to r30268
Diffstat (limited to 'loader')
-rw-r--r--loader/win32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/win32.c b/loader/win32.c
index 4a7f02162f..70070832f6 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -3839,7 +3839,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved)
}
void WINAPI CoUninitialize(void)
{
- return expCoUninitialize();
+ expCoUninitialize();
}
static DWORD WINAPI expSetThreadAffinityMask
@@ -5326,9 +5326,9 @@ struct libs libraries[]={
static WIN_BOOL WINAPI ext_stubs(void)
{
- volatile int idx = 0xdeadabcd;
+ volatile int idx = 0x0deadabc;
// make sure gcc does not do eip-relative call or something like that
- volatile void (*my_printf)(char *, char *) = (void *)0xdeadfbcd;
+ void (* volatile my_printf)(char *, char *) = (void *)0xdeadfbcd;
my_printf("Called unk_%s\n", export_names[idx]);
return 0;
}