diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 22:47:41 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 22:47:41 +0200 |
| commit | 8e593f5a34b4827d6ec97dd875c802267a6f03b7 (patch) | |
| tree | 648fde930e4a2b836a9803b17944c370a9608c72 /loader/ldt_keeper.c | |
| parent | bf31241e932818df3bc2eba55cf06c2b9ee3f56f (diff) | |
| parent | 5c10618fa191d306e6d6674dd2fc7ad46476f85d (diff) | |
| download | mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.bz2 mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.xz | |
Merge svn changes up to r30529
Diffstat (limited to 'loader/ldt_keeper.c')
| -rw-r--r-- | loader/ldt_keeper.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index adbe9900c9..35025888ca 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -60,14 +60,10 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount); #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include <machine/segments.h> #include <machine/sysarch.h> -#endif - -#if defined(__APPLE__) +#elif defined(__APPLE__) #include <architecture/i386/table.h> #include <i386/user_ldt.h> -#endif - -#ifdef __svr4__ +#elif defined(__svr4__) #include <sys/segment.h> #include <sys/sysi86.h> @@ -238,9 +234,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) perror("install_fs"); printf("Couldn't install fs segment, expect segfault\n"); } -#endif /*linux*/ - -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) { unsigned long d[2]; @@ -262,9 +256,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) #endif } } -#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ || __APPLE__ */ - -#if defined(__svr4__) +#elif defined(__svr4__) { struct ssd ssd; ssd.sel = LDT_SEL(TEB_SEL_IDX); |