DJGPP fixes from Laszlo Molnar.

p4raw-id: //depot/perl@13463

diff --git a/djgpp/configure.bat b/djgpp/configure.bat
index e7d41d7..db08fc2 100644 (file)
--- a/djgpp/configure.bat
+++ b/djgpp/configure.bat
@@ -1,37 +1,37 @@
-@echo off
-set CONFIG=
-set PATH_SEPARATOR=;
-set PATH_EXPAND=y
-sh -c 'if test $PATH_SEPARATOR = ";"; then exit 1; fi'
-if ERRORLEVEL 1 goto path_sep_ok
-echo Error:\a
-echo Make sure the environment variable PATH_SEPARATOR=; while building perl!
-echo Please check your DJGPP.ENV!
-goto end
-
-:path_sep_ok
-sh -c 'if test $PATH_EXPAND = "Y" -o $PATH_EXPAND = "y"; then exit 1; fi'
-if ERRORLEVEL 1 goto path_exp_ok
-echo Error:\a
-echo Make sure the environment variable PATH_EXPAND=Y while building perl!
-echo Please check your DJGPP.ENV!
-goto end
-
-:path_exp_ok
-sh -c '$SHELL -c "exit 128"'
-if ERRORLEVEL 128 goto shell_ok
-
-echo Error:\a
-echo The SHELL environment variable must be set to the full path of your sh.exe!
-goto end
-
-:shell_ok
-sh -c 'if test ! -d /tmp; then mkdir /tmp; fi'
-cp djgpp.c config.over ..
-cd ..
-echo Running sed...
-sh djgpp/djgppsed.sh
-
-echo Running Configure...
-sh Configure %1 %2 %3 %4 %5 %6 %7 %8 %9
-:end
+@echo off\r
+set CONFIG=\r
+set PATH_SEPARATOR=;\r
+set PATH_EXPAND=y\r
+sh -c 'if test $PATH_SEPARATOR = ";"; then exit 1; fi'\r
+if ERRORLEVEL 1 goto path_sep_ok\r
+echo Error:\a\r
+echo Make sure the environment variable PATH_SEPARATOR=; while building perl!\r
+echo Please check your DJGPP.ENV!\r
+goto end\r
+\r
+:path_sep_ok\r
+sh -c 'if test $PATH_EXPAND = "Y" -o $PATH_EXPAND = "y"; then exit 1; fi'\r
+if ERRORLEVEL 1 goto path_exp_ok\r
+echo Error:\a\r
+echo Make sure the environment variable PATH_EXPAND=Y while building perl!\r
+echo Please check your DJGPP.ENV!\r
+goto end\r
+\r
+:path_exp_ok\r
+sh -c '$SHELL -c "exit 128"'\r
+if ERRORLEVEL 128 goto shell_ok\r
+\r
+echo Error:\a\r
+echo The SHELL environment variable must be set to the full path of your sh.exe!\r
+goto end\r
+\r
+:shell_ok\r
+sh -c 'if test ! -d /tmp; then mkdir /tmp; fi'\r
+cp djgpp.[hc] config.over ..\r
+cd ..\r
+echo Running sed...\r
+sh djgpp/djgppsed.sh\r
+\r
+echo Running Configure...\r
+sh Configure %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+:end\r

diff --git a/djgpp/djgpp.h b/djgpp/djgpp.h
index 04aa4a2..a020ae9 100644 (file)
--- a/djgpp/djgpp.h
+++ b/djgpp/djgpp.h
@@ -28,7 +28,7 @@ int
 do_aspawn (pTHX_ SV *really,SV **mark,SV **sp);
 
 int
-do_spawn2 (pTHX_ char *cmd,int execf)
+do_spawn2 (pTHX_ char *cmd,int execf);
 
 int
 do_spawn (pTHX_ char *cmd);