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.

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 "_"