Mercurial > mplayer.hg
changeset 30483:74d33572f1ff
Merge some preprocessor conditionals where appropriate.
This saves a few lines and simplifies the code slightly.
| author | diego |
|---|---|
| date | Mon, 08 Feb 2010 10:05:49 +0000 |
| parents | 794b61a63cc7 |
| children | 0e067fdaf442 |
| files | loader/ldt_keeper.c |
| diffstat | 1 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/loader/ldt_keeper.c Sat Feb 06 19:57:45 2010 +0000 +++ b/loader/ldt_keeper.c Mon Feb 08 10:05:49 2010 +0000 @@ -60,14 +60,10 @@ #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 @@ 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 @@ #endif } } -#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ || __APPLE__ */ - -#if defined(__svr4__) +#elif defined(__svr4__) { struct ssd ssd; ssd.sel = LDT_SEL(TEB_SEL_IDX);