diff options
author | wm4 <wm4@mplayer2.org> | 2012-04-13 17:44:29 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-04-13 17:45:27 +0200 |
commit | 47371bdb944652bb17b8b779fae102ce63dd36b7 (patch) | |
tree | 495a2b71217a4fefe1c0672fce3d7cf9fabeb2e7 /loader | |
parent | 4dc0e54d4fffa2b81fbf6fb9b875303638eb1c9a (diff) | |
parent | 485f439cfefd4fa8d35f406fd8694e649bd536c8 (diff) | |
download | mpv-47371bdb944652bb17b8b779fae102ce63dd36b7.tar.bz2 mpv-47371bdb944652bb17b8b779fae102ce63dd36b7.tar.xz |
Merge remote-tracking branch 'origin/master'
Conflicts:
libvo/vo_kva.c
Diffstat (limited to 'loader')
-rw-r--r-- | loader/ldt_keeper.c | 3 | ||||
-rw-r--r-- | loader/module.c | 20 |
2 files changed, 0 insertions, 23 deletions
diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 3f7933426a..a5ae1d6b9a 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -254,9 +254,6 @@ ldt_fs_t* Setup_LDT_Keeper(void) printf("Couldn't install fs segment, expect segfault\n"); } } -#elif defined(__OS2__) - /* convert flat addr to sel idx for LDT_SEL() */ - fs_ldt = (uintptr_t)fs_seg >> 16; #endif Setup_FS_Segment(); diff --git a/loader/module.c b/loader/module.c index aa921c52d6..44769b74da 100644 --- a/loader/module.c +++ b/loader/module.c @@ -715,29 +715,9 @@ static int dump_component(char* name, int type, void* orig, ComponentParameters #ifdef EMU_QTX_API -#ifdef __OS2__ -uint32_t _System DosQueryMem(void *, uint32_t *, uint32_t *); -#endif - static int is_invalid_ptr_handle(void *p) { -#ifdef __OS2__ - uint32_t cb = 1; - uint32_t fl; - - if(DosQueryMem(p, &cb, &fl)) - return 1; - - // Occasionally, ptr with 'EXEC' attr is passed. - // On OS/2, however, malloc() never sets 'EXEC' attr. - // So ptr with 'EXEC' attr is invalid. - if(fl & 0x04) - return 1; - - return 0; -#else return (uint32_t)p >= 0x60000000; -#endif } static uint32_t ret_array[4096]; |