# HG changeset patch
# User diego
# Date 1265623549 0
# Node ID 74d33572f1ffcc6ae44e14cb8081bb69cba3ca97
# Parent  794b61a63cc7c653591949862c872e70acebad6b
Merge some preprocessor conditionals where appropriate.
This saves a few lines and simplifies the code slightly.

diff -r 794b61a63cc7 -r 74d33572f1ff loader/ldt_keeper.c
--- 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);