Fix the compile for -DPERL_OLD_COPY_ON_WRITE (apart from the tenacious

[p5sagit/p5-mst-13.2.git] / vmesa / vmesa.c

diff --git a/vmesa/vmesa.c b/vmesa/vmesa.c
index 8bc733b..59dd19b 100644 (file)
--- a/vmesa/vmesa.c
+++ b/vmesa/vmesa.c
@@ -121,7 +121,7 @@ do_aspawn(SV* really, SV **mark, SV **sp)
     status = FAIL;
     if (sp > mark)
     {
-       New(401,PL_Argv, sp - mark + 1, char*);
+       Newx(PL_Argv, sp - mark + 1, char*);
        a = PL_Argv;
        while (++mark <= sp)
        {
@@ -136,7 +136,7 @@ do_aspawn(SV* really, SV **mark, SV **sp)
        fdMap[STDOUT_FILENO] = Perl_stdout_fd;
        fdMap[STDERR_FILENO] = STDERR_FILENO;
        nFd                  = 3;
-       *a = Nullch;
+       *a = NULL;
        /*-----------------------------------------------------*/
        /* Will execvp() use PATH?                             */
        /*-----------------------------------------------------*/
@@ -260,7 +260,7 @@ do_spawn(char *cmd, int execf)
        }
     }
 
-    New(402,PL_Argv, (s - cmd) / 2 + 2, char*);
+    Newx(PL_Argv, (s - cmd) / 2 + 2, char*);
     PL_Cmd = savepvn(cmd, s-cmd);
     a = PL_Argv;
     for (s = PL_Cmd; *s;)
@@ -272,7 +272,7 @@ do_spawn(char *cmd, int execf)
        if (*s)
            *s++ = '\0';
     }
-    *a                   = Nullch;
+    *a                   = NULL;
     fdMap[STDIN_FILENO]  = Perl_stdin_fd;
     fdMap[STDOUT_FILENO] = Perl_stdout_fd;
     fdMap[STDERR_FILENO] = STDERR_FILENO;
@@ -421,7 +421,7 @@ my_popen(char *cmd, char *mode)
             close(pFd[that]);
          }
          else
-            fd = Nullfp;
+            fd = NULL;
       }
       else
       {
@@ -434,7 +434,7 @@ my_popen(char *cmd, char *mode)
       }
    }
    else
-      fd = Nullfp;
+      fd = NULL;
    return (fd);
 }