The problem described in 20010514.031 still wasn't

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

diff --git a/iperlsys.h b/iperlsys.h
index 66d2b8e..6c093dd 100644 (file)
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -251,8 +251,8 @@ struct IPerlStdIOInfo
 #define PerlSIO_setlinebuf(f)                                          \
        (*PL_StdIO->pSetlinebuf)(PL_StdIO, (f))
 #define PerlSIO_printf         Perl_fprintf_nocontext
-#define PerlSIO_stdoutf                *PL_StdIO->pPrintf
-#define PerlSIO_vprintf(f,fmt,a)                                       \
+#define PerlSIO_stdoutf                Perl_printf_nocontext
+#define PerlSIO_vprintf(f,fmt,a)                                               \
        (*PL_StdIO->pVprintf)(PL_StdIO, (f),(fmt),a)
 #define PerlSIO_ftell(f)                                                       \
        (*PL_StdIO->pTell)(PL_StdIO, (f))
@@ -781,36 +781,36 @@ struct IPerlMemInfo
 
 /* Shared memory macros */
 #define PerlMemShared_malloc(size)                         \
-       (*PL_MemShared->pMalloc)(PL_Mem, (size))
+       (*PL_MemShared->pMalloc)(PL_MemShared, (size))
 #define PerlMemShared_realloc(buf, size)                   \
-       (*PL_MemShared->pRealloc)(PL_Mem, (buf), (size))
+       (*PL_MemShared->pRealloc)(PL_MemShared, (buf), (size))
 #define PerlMemShared_free(buf)                                    \
-       (*PL_MemShared->pFree)(PL_Mem, (buf))
+       (*PL_MemShared->pFree)(PL_MemShared, (buf))
 #define PerlMemShared_calloc(num, size)                            \
-       (*PL_MemShared->pCalloc)(PL_Mem, (num), (size))
+       (*PL_MemShared->pCalloc)(PL_MemShared, (num), (size))
 #define PerlMemShared_get_lock()                           \
-       (*PL_MemShared->pGetLock)(PL_Mem)
+       (*PL_MemShared->pGetLock)(PL_MemShared)
 #define PerlMemShared_free_lock()                          \
-       (*PL_MemShared->pFreeLock)(PL_Mem)
+       (*PL_MemShared->pFreeLock)(PL_MemShared)
 #define PerlMemShared_is_locked()                          \
-       (*PL_MemShared->pIsLocked)(PL_Mem)
+       (*PL_MemShared->pIsLocked)(PL_MemShared)
 
 
 /* Parse tree memory macros */
 #define PerlMemParse_malloc(size)                          \
-       (*PL_MemParse->pMalloc)(PL_Mem, (size))
+       (*PL_MemParse->pMalloc)(PL_MemParse, (size))
 #define PerlMemParse_realloc(buf, size)                            \
-       (*PL_MemParse->pRealloc)(PL_Mem, (buf), (size))
+       (*PL_MemParse->pRealloc)(PL_MemParse, (buf), (size))
 #define PerlMemParse_free(buf)                             \
-       (*PL_MemParse->pFree)(PL_Mem, (buf))
+       (*PL_MemParse->pFree)(PL_MemParse, (buf))
 #define PerlMemParse_calloc(num, size)                     \
-       (*PL_MemParse->pCalloc)(PL_Mem, (num), (size))
+       (*PL_MemParse->pCalloc)(PL_MemParse, (num), (size))
 #define PerlMemParse_get_lock()                                    \
-       (*PL_MemParse->pGetLock)(PL_Mem)
+       (*PL_MemParse->pGetLock)(PL_MemParse)
 #define PerlMemParse_free_lock()                           \
-       (*PL_MemParse->pFreeLock)(PL_Mem)
+       (*PL_MemParse->pFreeLock)(PL_MemParse)
 #define PerlMemParse_is_locked()                           \
-       (*PL_MemParse->pIsLocked)(PL_Mem)
+       (*PL_MemParse->pIsLocked)(PL_MemParse)
 
 
 #else  /* PERL_IMPLICIT_SYS */
@@ -880,6 +880,8 @@ typedef int         (*LPProcKillpg)(struct IPerlProc*, int, int);
 typedef int            (*LPProcPauseProc)(struct IPerlProc*);
 typedef PerlIO*                (*LPProcPopen)(struct IPerlProc*, const char*,
                            const char*);
+typedef PerlIO*                (*LPProcPopenList)(struct IPerlProc*, const char*,
+                           IV narg, SV **args);
 typedef int            (*LPProcPclose)(struct IPerlProc*, PerlIO*);
 typedef int            (*LPProcPipe)(struct IPerlProc*, int*);
 typedef int            (*LPProcSetuid)(struct IPerlProc*, uid_t);
@@ -942,6 +944,7 @@ struct IPerlProc
     LPProcASpawn       pASpawn;
 #endif
     LPProcLastHost      pLastHost;
+    LPProcPopenList    pPopenList;
 };
 
 struct IPerlProcInfo
@@ -982,6 +985,8 @@ struct IPerlProcInfo
        (*PL_Proc->pPauseProc)(PL_Proc)
 #define PerlProc_popen(c, m)                                           \
        (*PL_Proc->pPopen)(PL_Proc, (c), (m))
+#define PerlProc_popen_list(m, n, a)                                   \
+       (*PL_Proc->pPopenList)(PL_Proc, (m), (n), (a))
 #define PerlProc_pclose(f)                                             \
        (*PL_Proc->pPclose)(PL_Proc, (f))
 #define PerlProc_pipe(fd)                                              \
@@ -1043,6 +1048,7 @@ struct IPerlProcInfo
 #define PerlProc_killpg(i, a)  killpg((i), (a))
 #define PerlProc_pause()       Pause()
 #define PerlProc_popen(c, m)   my_popen((c), (m))
+#define PerlProc_popen_list(m,n,a)     my_popen_list((m),(n),(a))
 #define PerlProc_pclose(f)     my_pclose((f))
 #define PerlProc_pipe(fd)      pipe((fd))
 #define PerlProc_setuid(u)     setuid((u))