diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:08:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:08:50 +0200 |
| commit | 194efde18f8f2621f847bd2bc2c13bf58e865730 (patch) | |
| tree | a98b71eb9727c082d71d1fc728c76e0393ea8b2a /loader | |
| parent | 415a39cad0c801a9b904e75090730dbe5232142d (diff) | |
| parent | e59081d1218547907a143ab54e1feaec43ec2bff (diff) | |
| download | mpv-194efde18f8f2621f847bd2bc2c13bf58e865730.tar.bz2 mpv-194efde18f8f2621f847bd2bc2c13bf58e865730.tar.xz | |
Merge svn changes up to r30702
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/module.c | 2 | ||||
| -rw-r--r-- | loader/win32.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/loader/module.c b/loader/module.c index feaab14605..3eb024460a 100644 --- a/loader/module.c +++ b/loader/module.c @@ -849,7 +849,6 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t #endif -#if 1 // emulate some functions: switch(reg->eax){ // memory management: @@ -895,7 +894,6 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t #endif return 1; } -#endif #if 0 switch(reg->eax){ diff --git a/loader/win32.c b/loader/win32.c index 3174c4e17d..fbd4d5a4e5 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -4611,6 +4611,7 @@ static INT WINAPI expMessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type * \param dest jump target */ void exp_EH_prolog(void *dest); +void exp_EH_prolog_dummy(void); //! just a dummy function that acts a container for the asm section void exp_EH_prolog_dummy(void) { __asm__ volatile ( |