Integrate from ansi branch to mainline.

[p5sagit/p5-mst-13.2.git] / dosish.h

diff --git a/dosish.h b/dosish.h
index 574fbfc..19eb5e8 100644 (file)
--- a/dosish.h
+++ b/dosish.h
@@ -1,6 +1,8 @@
 #define ABORT() abort();
 
+#ifndef SH_PATH
 #define SH_PATH "/bin/sh"
+#endif
 
 #ifdef DJGPP
 #  define BIT_BUCKET "nul"
@@ -9,10 +11,11 @@ void Perl_DJGPP_init();
 #  define PERL_SYS_INIT(argcp, argvp) STMT_START {        \
     Perl_DJGPP_init();    } STMT_END
 #else  /* DJGPP */
-#  define PERL_SYS_INIT(c,v)
 #  ifdef WIN32
+#    define PERL_SYS_INIT(c,v) Perl_win32_init(c,v)
 #    define BIT_BUCKET "nul"
 #  else
+#    define PERL_SYS_INIT(c,v)
 #    define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */
 #  endif
 #endif /* DJGPP */
@@ -91,12 +94,9 @@ void Perl_DJGPP_init();
 #ifndef WIN32
 #  define Stat(fname,bufptr) stat((fname),(bufptr))
 #else
-#  define Stat(fname,bufptr) win32_stat((fname),(bufptr))
-#  define my_getenv(var)  getenv(var)
 /*
- * the following are standard library calls (stdio in particular)
- * that is being redirected to the perl DLL. This is needed for 
- * Dynaloading any modules that called stdio functions
+ * This provides a layer of functions and macros to ensure extensions will
+ * get to use the same RTL functions as the core.
  */
 #  include <win32iop.h>
 #endif /* WIN32 */