summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2001-10-18 21:24:04 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2001-10-18 21:24:04 (GMT)
commit8a57f00081b6f83168007fc701447d7926acc6c4 (patch)
tree678a8bef3b2475dbb435b8c284e23c9515f9d8b8
parent1fff878c4587069e5c2976e157f4981599b50376 (diff)
downloadcpython-8a57f00081b6f83168007fc701447d7926acc6c4.zip
cpython-8a57f00081b6f83168007fc701447d7926acc6c4.tar.gz
cpython-8a57f00081b6f83168007fc701447d7926acc6c4.tar.bz2
Move dlfcn.h block out of NetBSD block, assuming that NetBSD before
199712 didn't have dlfcn.h, or that it wouldn't conflict with the other stuff defined.
-rw-r--r--Python/dynload_shlib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 548863a..569a6f5 100644
--- a/Python/dynload_shlib.c
+++ b/Python/dynload_shlib.c
@@ -6,18 +6,19 @@
#include <sys/types.h>
#include <sys/stat.h>
+
#if defined(__NetBSD__)
#include <sys/param.h>
#if (NetBSD < 199712)
#include <nlist.h>
#include <link.h>
#define dlerror() "error in dynamic linking"
-#else
+#endif
+#endif /* NetBSD */
+
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
-#endif
-#endif /* NetBSD */
#if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
#define LEAD_UNDERSCORE "_"