Fix PerlLIO_chsize() for platforms that don't have chsize()

[perl5.git] / iperlsys.h

diff --git a/iperlsys.h b/iperlsys.h
index 86823df..28e6719 100644 (file)
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -598,7 +598,7 @@ typedef int         (*LPLIOAccess)(struct IPerlLIO*, const char*, int);
 typedef int            (*LPLIOChmod)(struct IPerlLIO*, const char*, int);
 typedef int            (*LPLIOChown)(struct IPerlLIO*, const char*, uid_t,
                            gid_t);
-typedef int            (*LPLIOChsize)(struct IPerlLIO*, int, long);
+typedef int            (*LPLIOChsize)(struct IPerlLIO*, int, Off_t);
 typedef int            (*LPLIOClose)(struct IPerlLIO*, int);
 typedef int            (*LPLIODup)(struct IPerlLIO*, int);
 typedef int            (*LPLIODup2)(struct IPerlLIO*, int, int);
@@ -726,7 +726,13 @@ struct IPerlLIOInfo
 #define PerlLIO_access(file, mode)     access((file), (mode))
 #define PerlLIO_chmod(file, mode)      chmod((file), (mode))
 #define PerlLIO_chown(file, owner, grp)        chown((file), (owner), (grp))
-#define PerlLIO_chsize(fd, size)       chsize((fd), (size))
+#if defined(HAS_TRUNCATE)
+#  define PerlLIO_chsize(fd, size)     ftruncate((fd), (size))
+#elif defined(HAS_CHSIZE)
+#  define PerlLIO_chsize(fd, size)     chsize((fd), (size))
+#else
+#  define PerlLIO_chsize(fd, size)     my_chsize((fd), (size))
+#endif
 #define PerlLIO_close(fd)              close((fd))
 #define PerlLIO_dup(fd)                        dup((fd))
 #define PerlLIO_dup2(fd1, fd2)         dup2((fd1), (fd2))
@@ -810,7 +816,7 @@ struct IPerlMemInfo
 /* Shared memory macros */
 #ifdef NETWARE
 
- #define PerlMemShared_malloc(size)                        \
+#define PerlMemShared_malloc(size)                         \
        (*PL_Mem->pMalloc)(PL_Mem, (size))
 #define PerlMemShared_realloc(buf, size)                   \
        (*PL_Mem->pRealloc)(PL_Mem, (buf), (size))
@@ -945,12 +951,8 @@ typedef int                (*LPProcGetpid)(struct IPerlProc*);
 typedef void*          (*LPProcDynaLoader)(struct IPerlProc*, const char*);
 typedef void           (*LPProcGetOSError)(struct IPerlProc*,
                            SV* sv, DWORD dwErr);
-typedef void           (*LPProcFreeBuf)(struct IPerlProc*, char*);
-typedef BOOL           (*LPProcDoCmd)(struct IPerlProc*, char*);
-typedef int            (*LPProcSpawn)(struct IPerlProc*, char*);
 typedef int            (*LPProcSpawnvp)(struct IPerlProc*, int, const char*,
                            const char*const*);
-typedef int            (*LPProcASpawn)(struct IPerlProc*, void*, void**, void**);
 #endif
 typedef int            (*LPProcLastHost)(struct IPerlProc*);
 typedef int            (*LPProcGetTimeOfDay)(struct IPerlProc*,
@@ -988,10 +990,7 @@ struct IPerlProc
 #ifdef WIN32
     LPProcDynaLoader   pDynaLoader;
     LPProcGetOSError   pGetOSError;
-    LPProcDoCmd                pDoCmd;
-    LPProcSpawn                pSpawn;
     LPProcSpawnvp      pSpawnvp;
-    LPProcASpawn       pASpawn;
 #endif
     LPProcLastHost      pLastHost;
     LPProcPopenList    pPopenList;
@@ -1068,14 +1067,8 @@ struct IPerlProcInfo
        (*PL_Proc->pDynaLoader)(PL_Proc, (f))
 #define PerlProc_GetOSError(s,e)                                       \
        (*PL_Proc->pGetOSError)(PL_Proc, (s), (e))
-#define PerlProc_Cmd(s)                                                        \
-       (*PL_Proc->pDoCmd)(PL_Proc, (s))
-#define do_spawn(s)                                                    \
-       (*PL_Proc->pSpawn)(PL_Proc, (s))
-#define do_spawnvp(m, c, a)                                            \
+#define PerlProc_spawnvp(m, c, a)                                      \
        (*PL_Proc->pSpawnvp)(PL_Proc, (m), (c), (a))
-#define PerlProc_aspawn(m,c,a)                                         \
-       (*PL_Proc->pASpawn)(PL_Proc, (m), (c), (a))
 #endif
 #define PerlProc_lasthost()                                            \
        (*PL_Proc->pLastHost)(PL_Proc)
@@ -1122,6 +1115,8 @@ struct IPerlProcInfo
        win32_dynaload((f))
 #define PerlProc_GetOSError(s,e)                                       \
        win32_str_os_error((s), (e))
+#define PerlProc_spawnvp(m, c, a)                                      \
+       win32_spawnvp((m), (c), (a))
 #undef PerlProc_signal
 #define PerlProc_signal(n, h) win32_signal((n), (h))
 #endif