diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-08 10:05:49 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-08 10:05:49 +0000 |
commit | 79641e6232a575b360d6daa83cefc5546b954a79 (patch) | |
tree | d63983ec81dffaa6dff9dc3c3d716deac4460e17 /loader | |
parent | aedd1b4de8f516881de4e44613e98b59799e2996 (diff) | |
download | mpv-79641e6232a575b360d6daa83cefc5546b954a79.tar.bz2 mpv-79641e6232a575b360d6daa83cefc5546b954a79.tar.xz |
Merge some preprocessor conditionals where appropriate.
This saves a few lines and simplifies the code slightly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30525 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-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 8bffa6e958..a7c250de8e 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); |