OS/2 compilation fixes by Ilya

Subject: [PATCH 5.8.8] Build on OS/2
Message-ID: <20061128113629.GA18108@powdermilk.math.berkeley.edu>

p4raw-id: //depot/perl@29407

diff --git a/config_h.SH b/config_h.SH
index 1dff08e..9593b21 100644 (file)
--- a/config_h.SH
+++ b/config_h.SH
@@ -4054,6 +4054,18 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #define Pid_t $pidtype         /* PID type */
 
+/* INSTALL_PREFIX:
+ *     This symbol contains the "root" of installation tree for this package.
+ *     The program should be prepared to do ~ expansion.
+ */
+/* INSTALL_PREFIX_EXP:
+ *     This symbol contains the "root" of installation tree for this package
+ *     to be used
+ *     in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#define INSTALL_PREFIX "$installprefix"                /**/
+#define INSTALL_PREFIX_EXP "$installprefixexp" /**/
+
 /* PRIVLIB:
  *     This symbol contains the name of the private library for this package.
  *     The library is private in the sense that it needn't be in anyone's

diff --git a/perlvars.h b/perlvars.h
index 5bdad03..94792fe 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -55,7 +55,11 @@ PERLVAR(Gdollarzero_mutex, perl_mutex)       /* Modifying $0 */
 #endif
 
 /* This is constant on most architectures, a global on OS/2 */
+#ifdef OS2
+PERLVARI(Gsh_path,           char *,   SH_PATH)/* full path of shell */
+#else
 PERLVARI(Gsh_path,     const char *,   SH_PATH)/* full path of shell */
+#endif
 
 #ifndef PERL_MICRO
 /* If Perl has to ignore SIGPFE, this is its saved state.