diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-03-14 20:23:53 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-03-14 20:23:53 +0000 |
| commit | 5f464b2eb090216cc66e37fd53ea85cc759ad9be (patch) | |
| tree | 145fddc57f1ae9d25e7a8f256f37671988a9e4e7 /ext/DynaLoader | |
| parent | 521126c3fedddba92be66cb8ba2a79ad25c9dc95 (diff) | |
| download | perl-5f464b2eb090216cc66e37fd53ea85cc759ad9be.tar.gz | |
Retract #9136: breaks threading (and binary compatibility).
p4raw-id: //depot/perl@9155
Diffstat (limited to 'ext/DynaLoader')
| -rw-r--r-- | ext/DynaLoader/dl_aix.xs | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs index 95c8b1c838..b2c92d8070 100644 --- a/ext/DynaLoader/dl_aix.xs +++ b/ext/DynaLoader/dl_aix.xs @@ -14,21 +14,6 @@ #define PERLIO_NOT_STDIO 0 /* - * On AIX 4.3 and above the emulation layer is not needed any more, and - * indeed if perl uses its emulation and perl is linked into apache - * which is supposed to use the native dlopen conflicts arise. - * Jens-Uwe Mager jum@helios.de - */ -#ifdef USE_NATIVE_DLOPEN - -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" -#include <dlfcn.h> - -#else - -/* * @(#)dlfcn.c 1.5 revision of 93/02/14 20:14:17 * This is an unpublished work copyright (c) 1992 Helios Software GmbH * 3000 Hannover 1, Germany @@ -104,13 +89,6 @@ # define FREAD(p,s,n,ldptr) fread(p,s,n,IOPTR(ldptr)) #endif -#ifndef RTLD_LAZY -# define RTLD_LAZY 0 -#endif -#ifndef RTLD_GLOBAL -# define RTLD_GLOBAL 0 -#endif - /* * We simulate dlopen() et al. through a call to load. Because AIX has * no call to find an exported symbol we read the loader section of the @@ -649,7 +627,6 @@ static void * findMain(void) safefree(buf); return ret; } -#endif /* USE_NATIVE_DLOPEN */ /* dl_dlopen.xs * @@ -695,7 +672,7 @@ dl_load_file(filename, flags=0) DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags)); if (flags & 0x01) Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename); - RETVAL = dlopen(filename, RTLD_GLOBAL|RTLD_LAZY) ; + RETVAL = dlopen(filename, 1) ; DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL)); ST(0) = sv_newmortal() ; if (RETVAL == NULL) |