summaryrefslogtreecommitdiff
path: root/embedvar.h
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-05-01 12:25:58 +0100
committerNicholas Clark <nick@ccl4.org>2011-06-12 16:15:22 +0200
commit0447859b8a048144ae0ece76a2f7595840942fcb (patch)
tree665b7b2c2e89cfdc6022bd547b12e17572790aa3 /embedvar.h
parent58f645e20791a7788fcb38189895a712d5c53419 (diff)
downloadperl-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 'embedvar.h')
-rw-r--r--embedvar.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/embedvar.h b/embedvar.h
index 3d5fb88eab..a6c894ab8e 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -763,8 +763,10 @@
#define PL_Grunops_dbg (my_vars->Grunops_dbg)
#define PL_runops_std (my_vars->Grunops_std)
#define PL_Grunops_std (my_vars->Grunops_std)
+#ifdef OS2
#define PL_sh_path (my_vars->Gsh_path)
#define PL_Gsh_path (my_vars->Gsh_path)
+#endif
#define PL_sig_defaulting (my_vars->Gsig_defaulting)
#define PL_Gsig_defaulting (my_vars->Gsig_defaulting)
#define PL_sig_handlers_initted (my_vars->Gsig_handlers_initted)
@@ -821,7 +823,9 @@
#define PL_Grevision PL_revision
#define PL_Grunops_dbg PL_runops_dbg
#define PL_Grunops_std PL_runops_std
+#ifdef OS2
#define PL_Gsh_path PL_sh_path
+#endif
#define PL_Gsig_defaulting PL_sig_defaulting
#define PL_Gsig_handlers_initted PL_sig_handlers_initted
#define PL_Gsig_ignoring PL_sig_ignoring