RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2010-02-08 10:05:49 +00:00
parent aedd1b4de8
commit 79641e6232
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
loader/ldt_keeper.c
View File

@ -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);