[Python-checkins] CVS: python/dist/src/Python dynload_shlib.c,2.11,2.12
Martin v. L?wis
loewis@users.sourceforge.net
Thu, 18 Oct 2001 14:24:07 -0700
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv21029
Modified Files:
dynload_shlib.c
Log Message:
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.
Index: dynload_shlib.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/dynload_shlib.c,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** dynload_shlib.c 2001/10/18 11:45:19 2.11
--- dynload_shlib.c 2001/10/18 21:24:04 2.12
***************
*** 7,10 ****
--- 7,11 ----
#include <sys/types.h>
#include <sys/stat.h>
+
#if defined(__NetBSD__)
#include <sys/param.h>
***************
*** 13,22 ****
#include <link.h>
#define dlerror() "error in dynamic linking"
! #else
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
- #endif
- #endif /* NetBSD */
#if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
--- 14,23 ----
#include <link.h>
#define dlerror() "error in dynamic linking"
! #endif
! #endif /* NetBSD */
!
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
#if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)