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/ldt_keeper.c | |
| 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/ldt_keeper.c')
| -rw-r--r-- | loader/ldt_keeper.c | 3 |
1 files changed, 0 insertions, 3 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(); |