[Python-checkins] CVS: python/dist/src/Python dynload_shlib.c,2.8,2.8.4.1
Anthony Baxter
anthonybaxter@users.sourceforge.net
2001年11月20日 21:01:46 -0800
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv11878
Modified Files:
Tag: release21-maint
dynload_shlib.c
Log Message:
backport of patches 2.10, 2.11, 2.12, by MvL.
. Patch #455231: Support ELF properly on OpenBSD.
. Patch to bug #472202: Correctly recognize NetBSD before 199712.
. 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.8
retrieving revision 2.8.4.1
diff -C2 -d -r2.8 -r2.8.4.1
*** dynload_shlib.c 2001年01月10日 21:17:27 2.8
--- dynload_shlib.c 2001年11月21日 05:01:44 2.8.4.1
***************
*** 7,21 ****
#include <sys/types.h>
#include <sys/stat.h>
! #if defined(__NetBSD__) && (NetBSD < 199712)
#include <nlist.h>
#include <link.h>
#define dlerror() "error in dynamic linking"
! #else
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
- #endif
! #ifdef __OpenBSD__
#define LEAD_UNDERSCORE "_"
#else
--- 7,25 ----
#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"
! #endif
! #endif /* NetBSD */
!
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
! #if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
#define LEAD_UNDERSCORE "_"
#else