diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-05-01 12:25:58 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-06-12 16:15:22 +0200 |
| commit | 0447859b8a048144ae0ece76a2f7595840942fcb (patch) | |
| tree | 665b7b2c2e89cfdc6022bd547b12e17572790aa3 /perlvars.h | |
| parent | 58f645e20791a7788fcb38189895a712d5c53419 (diff) | |
| download | perl-0447859b8a048144ae0ece76a2f7595840942fcb.tar.gz | |
Move PL_sh_path to perl.h (except for OS/2), as it's const char[]
On OS/2, keep it in perlvars.h, as it's not const there. makedef.pl doesn't
pay attention to C pre-processor symbols, so it will always see the declaration
in perlvars.h, and add the symbol to the linker file, so no need to mention
sh_path in globvar.sym. Add special case logic in regen/embed.pl to make the
embedvar.h macros for PL_sh_path defined only on OS/2.
Diffstat (limited to 'perlvars.h')
| -rw-r--r-- | perlvars.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/perlvars.h b/perlvars.h index d3764d57d1..fb6201ecef 100644 --- a/perlvars.h +++ b/perlvars.h @@ -50,12 +50,8 @@ PERLVAR(Gdollarzero_mutex, perl_mutex) /* Modifying $0 */ /* This is constant on most architectures, a global on OS/2 */ #ifdef OS2 -# define PERL___C -#else -# define PERL___C const +PERLVARI(Gsh_path, char *, SH_PATH) /* full path of shell */ #endif -PERLVARI(Gsh_path, PERL___C char *, SH_PATH) /* full path of shell */ -#undef PERL___C #ifndef PERL_MICRO /* If Perl has to ignore SIGPFE, this is its saved state. |