diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-02-21 18:23:46 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-02-21 22:13:08 +0100 |
| commit | 3964fe451ce5f6b8f88b9ff141ae23128368356b (patch) | |
| tree | 5b07079bcad8c43735a45eb27dbe06bd6e669be6 /perl.c | |
| parent | 04c9eeccd3e478befe53fb07abf3922d22fd9d69 (diff) | |
| download | perl-3964fe451ce5f6b8f88b9ff141ae23128368356b.tar.gz | |
Change the value passed into S_init_perllib() to a boolean flag.
Diffstat (limited to 'perl.c')
| -rw-r--r-- | perl.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1979,7 +1979,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) S_set_caret_X(aTHX); TAINT_NOT; init_perllib(0); - init_perllib(INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR); + init_perllib(0x100 /* A value that is not a used flag bit. */ ); { bool suidscript = FALSE; @@ -4111,7 +4111,7 @@ S_init_perllib(pTHX_ U32 old_vers) #else if (s) #endif - incpush_use_sep(s, 0, old_vers ? old_vers : INCPUSH_ADD_SUB_DIRS); + incpush_use_sep(s, 0, old_vers ? INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR : INCPUSH_ADD_SUB_DIRS); else if (!old_vers) { s = PerlEnv_getenv("PERLLIB"); if (s) @@ -4126,7 +4126,7 @@ S_init_perllib(pTHX_ U32 old_vers) int idx = 0; if (my_trnlnm("PERL5LIB",buf,0)) do { - incpush_use_sep(buf, 0, old_vers ? old_vers : INCPUSH_ADD_SUB_DIRS); + incpush_use_sep(buf, 0, old_vers ? INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR : INCPUSH_ADD_SUB_DIRS); } while (my_trnlnm("PERL5LIB",buf,++idx)); else if (!old_vers) while (my_trnlnm("PERLLIB",buf,idx++)) @@ -4141,7 +4141,7 @@ S_init_perllib(pTHX_ U32 old_vers) if (!old_vers) { S_incpush_use_sep(aTHX_ STR_WITH_LEN(APPLLIB_EXP), INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); } else { - S_incpush_use_sep(aTHX_ STR_WITH_LEN(APPLLIB_EXP), old_vers|INCPUSH_CAN_RELOCATE); + S_incpush_use_sep(aTHX_ STR_WITH_LEN(APPLLIB_EXP), INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE); } #endif @@ -4195,7 +4195,7 @@ S_init_perllib(pTHX_ U32 old_vers) #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST) /* Search for version-specific dirs below here */ - S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM), old_vers|INCPUSH_CAN_RELOCATE); + S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM), old_vers ? INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE : INCPUSH_CAN_RELOCATE); #endif if (!old_vers) { @@ -4221,7 +4221,7 @@ S_init_perllib(pTHX_ U32 old_vers) #if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST) /* Search for version-specific dirs below here */ - S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM), old_vers|INCPUSH_CAN_RELOCATE); + S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM), old_vers ? INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE : INCPUSH_CAN_RELOCATE); #endif if (!old_vers) { @@ -4251,7 +4251,7 @@ S_init_perllib(pTHX_ U32 old_vers) S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), INCPUSH_ADD_SUB_DIRS |INCPUSH_CAN_RELOCATE); } else { - S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), old_vers|INCPUSH_CAN_RELOCATE); + S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE); } #endif |