X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/1f47e8e2e6e01cf4845f0f3f0f0c7524761ffa80..373290c6ef7565688c00eb8b15c9dffc113c682b:/iperlsys.h

diff --git a/iperlsys.h b/iperlsys.h
index 2adb321..081d8b2 100644
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -49,85 +49,66 @@
  *
  */
 
-
 /*
-    Interface for perl stdio functions
-*/
-
-
-/* Clean up (or at least document) the various possible #defines.
-   This section attempts to match the 5.003_03 Configure variables
-   onto the 5.003_02 header file values.
-   I can't figure out where USE_STDIO was supposed to be set.
-   --AD
+    Interface for perl stdio functions, or whatever we are Configure-d
+    to use.
 */
-#ifndef USE_PERLIO
-# define PERLIO_IS_STDIO
-#endif
+#include "perlio.h"
 
-/* Below is the 5.003_02 stuff. */
-#ifdef USE_STDIO
-#  ifndef PERLIO_IS_STDIO
-#      define PERLIO_IS_STDIO
-#  endif
-#else
-extern void PerlIO_init (void);
+#ifndef Sighandler_t
+typedef Signal_t (*Sighandler_t) (int);
 #endif
 
-#ifdef PERL_OBJECT
-
-#ifndef PerlIO
-typedef struct _PerlIO PerlIO;
-#endif
+#if defined(PERL_IMPLICIT_SYS)
 
 /* IPerlStdIO		*/
 struct IPerlStdIO;
-typedef PerlIO*		(*LPStdin)(struct IPerlStdIO*);
-typedef PerlIO*		(*LPStdout)(struct IPerlStdIO*);
-typedef PerlIO*		(*LPStderr)(struct IPerlStdIO*);
-typedef PerlIO*		(*LPOpen)(struct IPerlStdIO*, const char*,
+struct IPerlStdIOInfo;
+typedef FILE*		(*LPStdin)(struct IPerlStdIO*);
+typedef FILE*		(*LPStdout)(struct IPerlStdIO*);
+typedef FILE*		(*LPStderr)(struct IPerlStdIO*);
+typedef FILE*		(*LPOpen)(struct IPerlStdIO*, const char*,
 			    const char*);
-typedef int		(*LPClose)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPEof)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPError)(struct IPerlStdIO*, PerlIO*);
-typedef void		(*LPClearerr)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPGetc)(struct IPerlStdIO*, PerlIO*);
-typedef char*		(*LPGetBase)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPGetBufsiz)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPGetCnt)(struct IPerlStdIO*, PerlIO*);
-typedef char*		(*LPGetPtr)(struct IPerlStdIO*, PerlIO*);
-typedef char*		(*LPGets)(struct IPerlStdIO*, PerlIO*, char*, int);
-typedef int		(*LPPutc)(struct IPerlStdIO*, PerlIO*, int);
-typedef int		(*LPPuts)(struct IPerlStdIO*, PerlIO*, const char*);
-typedef int		(*LPFlush)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPUngetc)(struct IPerlStdIO*, PerlIO*,int);
-typedef int		(*LPFileno)(struct IPerlStdIO*, PerlIO*);
-typedef PerlIO*		(*LPFdopen)(struct IPerlStdIO*, int, const char*);
-typedef PerlIO*		(*LPReopen)(struct IPerlStdIO*, const char*,
-			    const char*, PerlIO*);
-typedef SSize_t		(*LPRead)(struct IPerlStdIO*, PerlIO*, void*, Size_t);
-typedef SSize_t		(*LPWrite)(struct IPerlStdIO*, PerlIO*, const void*,
-			    Size_t);
-typedef void		(*LPSetBuf)(struct IPerlStdIO*, PerlIO*, char*);
-typedef int		(*LPSetVBuf)(struct IPerlStdIO*, PerlIO*, char*, int,
+typedef int		(*LPClose)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPEof)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPError)(struct IPerlStdIO*, FILE*);
+typedef void		(*LPClearerr)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPGetc)(struct IPerlStdIO*, FILE*);
+typedef char*		(*LPGetBase)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPGetBufsiz)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPGetCnt)(struct IPerlStdIO*, FILE*);
+typedef char*		(*LPGetPtr)(struct IPerlStdIO*, FILE*);
+typedef char*		(*LPGets)(struct IPerlStdIO*, FILE*, char*, int);
+typedef int		(*LPPutc)(struct IPerlStdIO*, FILE*, int);
+typedef int		(*LPPuts)(struct IPerlStdIO*, FILE*, const char*);
+typedef int		(*LPFlush)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPUngetc)(struct IPerlStdIO*, int,FILE*);
+typedef int		(*LPFileno)(struct IPerlStdIO*, FILE*);
+typedef FILE*		(*LPFdopen)(struct IPerlStdIO*, int, const char*);
+typedef FILE*		(*LPReopen)(struct IPerlStdIO*, const char*,
+			    const char*, FILE*);
+typedef SSize_t		(*LPRead)(struct IPerlStdIO*, void*, Size_t, Size_t, FILE *);
+typedef SSize_t		(*LPWrite)(struct IPerlStdIO*, const void*, Size_t, Size_t, FILE *);
+typedef void		(*LPSetBuf)(struct IPerlStdIO*, FILE*, char*);
+typedef int		(*LPSetVBuf)(struct IPerlStdIO*, FILE*, char*, int,
 			    Size_t);
-typedef void		(*LPSetCnt)(struct IPerlStdIO*, PerlIO*, int);
-typedef void		(*LPSetPtrCnt)(struct IPerlStdIO*, PerlIO*, char*,
-			    int);
-typedef void		(*LPSetlinebuf)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPPrintf)(struct IPerlStdIO*, PerlIO*, const char*, 
+typedef void		(*LPSetCnt)(struct IPerlStdIO*, FILE*, int);
+typedef void		(*LPSetPtr)(struct IPerlStdIO*, FILE*, char*);
+typedef void		(*LPSetlinebuf)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPPrintf)(struct IPerlStdIO*, FILE*, const char*,
 			    ...);
-typedef int		(*LPVprintf)(struct IPerlStdIO*, PerlIO*, const char*,
+typedef int		(*LPVprintf)(struct IPerlStdIO*, FILE*, const char*,
 			    va_list);
-typedef long		(*LPTell)(struct IPerlStdIO*, PerlIO*);
-typedef int		(*LPSeek)(struct IPerlStdIO*, PerlIO*, Off_t, int);
-typedef void		(*LPRewind)(struct IPerlStdIO*, PerlIO*);
-typedef PerlIO*		(*LPTmpfile)(struct IPerlStdIO*);
-typedef int		(*LPGetpos)(struct IPerlStdIO*, PerlIO*, Fpos_t*);
-typedef int		(*LPSetpos)(struct IPerlStdIO*, PerlIO*,
+typedef long		(*LPTell)(struct IPerlStdIO*, FILE*);
+typedef int		(*LPSeek)(struct IPerlStdIO*, FILE*, Off_t, int);
+typedef void		(*LPRewind)(struct IPerlStdIO*, FILE*);
+typedef FILE*		(*LPTmpfile)(struct IPerlStdIO*);
+typedef int		(*LPGetpos)(struct IPerlStdIO*, FILE*, Fpos_t*);
+typedef int		(*LPSetpos)(struct IPerlStdIO*, FILE*,
 			    const Fpos_t*);
 typedef void		(*LPInit)(struct IPerlStdIO*);
 typedef void		(*LPInitOSExtras)(struct IPerlStdIO*);
+typedef FILE*		(*LPFdupopen)(struct IPerlStdIO*, FILE*);
 
 struct IPerlStdIO
 {
@@ -157,7 +138,7 @@ struct IPerlStdIO
     LPSetBuf		pSetBuf;
     LPSetVBuf		pSetVBuf;
     LPSetCnt		pSetCnt;
-    LPSetPtrCnt		pSetPtrCnt;
+    LPSetPtr		pSetPtr;
     LPSetlinebuf	pSetlinebuf;
     LPPrintf		pPrintf;
     LPVprintf		pVprintf;
@@ -169,6 +150,7 @@ struct IPerlStdIO
     LPSetpos		pSetpos;
     LPInit		pInit;
     LPInitOSExtras	pInitOSExtras;
+    LPFdupopen		pFdupopen;
 };
 
 struct IPerlStdIOInfo
@@ -177,299 +159,201 @@ struct IPerlStdIOInfo
     struct IPerlStdIO	perlStdIOList;
 };
 
+/* These do not belong here ... NI-S, 14 Nov 2000 */
+
 #ifdef USE_STDIO_PTR
-#  define PerlIO_has_cntptr(f)		1       
-#  ifdef STDIO_CNT_LVALUE
-#    define PerlIO_canset_cnt(f)	1      
-#    ifdef STDIO_PTR_LVALUE
-#      define PerlIO_fast_gets(f)	1        
+#  define PerlSIO_has_cntptr(f)		1
+#  ifdef STDIO_PTR_LVALUE
+#    ifdef  STDIO_CNT_LVALUE
+#      define PerlSIO_canset_cnt(f)	1
+#      ifdef STDIO_PTR_LVAL_NOCHANGE_CNT
+#        define PerlSIO_fast_gets(f)	1
+#      endif
+#    else /* STDIO_CNT_LVALUE */
+#      define PerlSIO_canset_cnt(f)	0
+#    endif
+#  else /* STDIO_PTR_LVALUE */
+#    ifdef STDIO_PTR_LVAL_SETS_CNT
+#      define PerlSIO_fast_gets(f)	1
 #    endif
-#  else
-#    define PerlIO_canset_cnt(f)	0      
 #  endif
 #else  /* USE_STDIO_PTR */
-#  define PerlIO_has_cntptr(f)		0
-#  define PerlIO_canset_cnt(f)		0
+#  define PerlSIO_has_cntptr(f)		0
+#  define PerlSIO_canset_cnt(f)		0
 #endif /* USE_STDIO_PTR */
 
-#ifndef PerlIO_fast_gets
-#define PerlIO_fast_gets(f)		0        
+#ifndef PerlSIO_fast_gets
+#define PerlSIO_fast_gets(f)		0
 #endif
 
 #ifdef FILE_base
-#define PerlIO_has_base(f)		1
+#define PerlSIO_has_base(f)		1
 #else
-#define PerlIO_has_base(f)		0
-#endif
-
-#define PerlIO_stdin()							\
-	(*PL_piStdIO->pStdin)(PL_piStdIO)
-#define PerlIO_stdout()							\
-	(*PL_piStdIO->pStdout)(PL_piStdIO)
-#define PerlIO_stderr()							\
-	(*PL_piStdIO->pStderr)(PL_piStdIO)
-#define PerlIO_open(x,y)						\
-	(*PL_piStdIO->pOpen)(PL_piStdIO, (x),(y))
-#define PerlIO_close(f)							\
-	(*PL_piStdIO->pClose)(PL_piStdIO, (f))
-#define PerlIO_eof(f)							\
-	(*PL_piStdIO->pEof)(PL_piStdIO, (f))
-#define PerlIO_error(f)							\
-	(*PL_piStdIO->pError)(PL_piStdIO, (f))
-#define PerlIO_clearerr(f)						\
-	(*PL_piStdIO->pClearerr)(PL_piStdIO, (f))
-#define PerlIO_getc(f)							\
-	(*PL_piStdIO->pGetc)(PL_piStdIO, (f))
-#define PerlIO_get_base(f)						\
-	(*PL_piStdIO->pGetBase)(PL_piStdIO, (f))
-#define PerlIO_get_bufsiz(f)						\
-	(*PL_piStdIO->pGetBufsiz)(PL_piStdIO, (f))
-#define PerlIO_get_cnt(f)						\
-	(*PL_piStdIO->pGetCnt)(PL_piStdIO, (f))
-#define PerlIO_get_ptr(f)						\
-	(*PL_piStdIO->pGetPtr)(PL_piStdIO, (f))
-#define PerlIO_putc(f,c)						\
-	(*PL_piStdIO->pPutc)(PL_piStdIO, (f),(c))
-#define PerlIO_puts(f,s)						\
-	(*PL_piStdIO->pPuts)(PL_piStdIO, (f),(s))
-#define PerlIO_flush(f)							\
-	(*PL_piStdIO->pFlush)(PL_piStdIO, (f))
-#define PerlIO_gets(s, n, fp)						\
-	(*PL_piStdIO->pGets)(PL_piStdIO, (fp), s, n)
-#define PerlIO_ungetc(f,c)						\
-	(*PL_piStdIO->pUngetc)(PL_piStdIO, (f),(c))
-#define PerlIO_fileno(f)						\
-	(*PL_piStdIO->pFileno)(PL_piStdIO, (f))
-#define PerlIO_fdopen(f, s)						\
-	(*PL_piStdIO->pFdopen)(PL_piStdIO, (f),(s))
-#define PerlIO_reopen(p, m, f)						\
-	(*PL_piStdIO->pReopen)(PL_piStdIO, (p), (m), (f))
-#define PerlIO_read(f,buf,count)					\
-	(SSize_t)(*PL_piStdIO->pRead)(PL_piStdIO, (f), (buf), (count))
-#define PerlIO_write(f,buf,count)					\
-	(*PL_piStdIO->pWrite)(PL_piStdIO, (f), (buf), (count))
-#define PerlIO_setbuf(f,b)						\
-	(*PL_piStdIO->pSetBuf)(PL_piStdIO, (f), (b))
-#define PerlIO_setvbuf(f,b,t,s)						\
-	(*PL_piStdIO->pSetVBuf)(PL_piStdIO, (f),(b),(t),(s))
-#define PerlIO_set_cnt(f,c)						\
-	(*PL_piStdIO->pSetCnt)(PL_piStdIO, (f), (c))
-#define PerlIO_set_ptrcnt(f,p,c)					\
-	(*PL_piStdIO->pSetPtrCnt)(PL_piStdIO, (f), (p), (c))
-#define PerlIO_setlinebuf(f)						\
-	(*PL_piStdIO->pSetlinebuf)(PL_piStdIO, (f))
-#define PerlIO_printf		fprintf
-#define PerlIO_stdoutf		*PL_piStdIO->pPrintf
-#define PerlIO_vprintf(f,fmt,a)						\
-	(*PL_piStdIO->pVprintf)(PL_piStdIO, (f),(fmt),a)          
-#define PerlIO_tell(f)							\
-	(*PL_piStdIO->pTell)(PL_piStdIO, (f))
-#define PerlIO_seek(f,o,w)						\
-	(*PL_piStdIO->pSeek)(PL_piStdIO, (f),(o),(w))
-#define PerlIO_getpos(f,p)						\
-	(*PL_piStdIO->pGetpos)(PL_piStdIO, (f),(p))
-#define PerlIO_setpos(f,p)						\
-	(*PL_piStdIO->pSetpos)(PL_piStdIO, (f),(p))
-#define PerlIO_rewind(f)						\
-	(*PL_piStdIO->pRewind)(PL_piStdIO, (f))
-#define PerlIO_tmpfile()						\
-	(*PL_piStdIO->pTmpfile)(PL_piStdIO)
-#define PerlIO_init()							\
-	(*PL_piStdIO->pInit)(PL_piStdIO)
+#define PerlSIO_has_base(f)		0
+#endif
+
+/* Now take FILE * via function table */
+
+#define PerlSIO_stdin							\
+	(*PL_StdIO->pStdin)(PL_StdIO)
+#define PerlSIO_stdout							\
+	(*PL_StdIO->pStdout)(PL_StdIO)
+#define PerlSIO_stderr							\
+	(*PL_StdIO->pStderr)(PL_StdIO)
+#define PerlSIO_fopen(x,y)						\
+	(*PL_StdIO->pOpen)(PL_StdIO, (x),(y))
+#define PerlSIO_fclose(f)						\
+	(*PL_StdIO->pClose)(PL_StdIO, (f))
+#define PerlSIO_feof(f)							\
+	(*PL_StdIO->pEof)(PL_StdIO, (f))
+#define PerlSIO_ferror(f)						\
+	(*PL_StdIO->pError)(PL_StdIO, (f))
+#define PerlSIO_clearerr(f)						\
+	(*PL_StdIO->pClearerr)(PL_StdIO, (f))
+#define PerlSIO_fgetc(f)						\
+	(*PL_StdIO->pGetc)(PL_StdIO, (f))
+#define PerlSIO_get_base(f)						\
+	(*PL_StdIO->pGetBase)(PL_StdIO, (f))
+#define PerlSIO_get_bufsiz(f)						\
+	(*PL_StdIO->pGetBufsiz)(PL_StdIO, (f))
+#define PerlSIO_get_cnt(f)						\
+	(*PL_StdIO->pGetCnt)(PL_StdIO, (f))
+#define PerlSIO_get_ptr(f)						\
+	(*PL_StdIO->pGetPtr)(PL_StdIO, (f))
+#define PerlSIO_fputc(f,c)						\
+	(*PL_StdIO->pPutc)(PL_StdIO, (f),(c))
+#define PerlSIO_fputs(f,s)						\
+	(*PL_StdIO->pPuts)(PL_StdIO, (f),(s))
+#define PerlSIO_fflush(f)						\
+	(*PL_StdIO->pFlush)(PL_StdIO, (f))
+#define PerlSIO_fgets(s, n, fp)						\
+	(*PL_StdIO->pGets)(PL_StdIO, (fp), s, n)
+#define PerlSIO_ungetc(c,f)						\
+	(*PL_StdIO->pUngetc)(PL_StdIO, (c),(f))
+#define PerlSIO_fileno(f)						\
+	(*PL_StdIO->pFileno)(PL_StdIO, (f))
+#define PerlSIO_fdopen(f, s)						\
+	(*PL_StdIO->pFdopen)(PL_StdIO, (f),(s))
+#define PerlSIO_freopen(p, m, f)					\
+	(*PL_StdIO->pReopen)(PL_StdIO, (p), (m), (f))
+#define PerlSIO_fread(buf,sz,count,f)					\
+	(*PL_StdIO->pRead)(PL_StdIO, (buf), (sz), (count), (f))
+#define PerlSIO_fwrite(buf,sz,count,f)					\
+	(*PL_StdIO->pWrite)(PL_StdIO, (buf), (sz), (count), (f))
+#define PerlSIO_setbuf(f,b)						\
+	(*PL_StdIO->pSetBuf)(PL_StdIO, (f), (b))
+#define PerlSIO_setvbuf(f,b,t,s)					\
+	(*PL_StdIO->pSetVBuf)(PL_StdIO, (f),(b),(t),(s))
+#define PerlSIO_set_cnt(f,c)						\
+	(*PL_StdIO->pSetCnt)(PL_StdIO, (f), (c))
+#define PerlSIO_set_ptr(f,p)						\
+	(*PL_StdIO->pSetPtr)(PL_StdIO, (f), (p))
+#define PerlSIO_setlinebuf(f)						\
+	(*PL_StdIO->pSetlinebuf)(PL_StdIO, (f))
+#define PerlSIO_printf		Perl_fprintf_nocontext
+#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))
+#define PerlSIO_fseek(f,o,w)						\
+	(*PL_StdIO->pSeek)(PL_StdIO, (f),(o),(w))
+#define PerlSIO_fgetpos(f,p)						\
+	(*PL_StdIO->pGetpos)(PL_StdIO, (f),(p))
+#define PerlSIO_fsetpos(f,p)						\
+	(*PL_StdIO->pSetpos)(PL_StdIO, (f),(p))
+#define PerlSIO_rewind(f)						\
+	(*PL_StdIO->pRewind)(PL_StdIO, (f))
+#define PerlSIO_tmpfile()						\
+	(*PL_StdIO->pTmpfile)(PL_StdIO)
+#define PerlSIO_init()							\
+	(*PL_StdIO->pInit)(PL_StdIO)
 #undef 	init_os_extras
-#define init_os_extras(x)						\
-	(*PL_piStdIO->pInitOSExtras)(PL_piStdIO)
-
-#else	/* PERL_OBJECT */
-
-#include "perlsdio.h"
-
-#endif	/* PERL_OBJECT */
-
-#ifndef PERLIO_IS_STDIO
-#ifdef USE_SFIO
-#include "perlsfio.h"
-#endif /* USE_SFIO */
-#endif /* PERLIO_IS_STDIO */
-
-#ifndef EOF
-#define EOF (-1)
-#endif
-
-/* This is to catch case with no stdio */
-#ifndef BUFSIZ
-#define BUFSIZ 1024
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END 2
-#endif
-
-#ifndef PerlIO
-struct _PerlIO;
-#define PerlIO struct _PerlIO
-#endif /* No PerlIO */
-
-#ifndef Fpos_t
-#define Fpos_t long
-#endif
-
-#ifndef NEXT30_NO_ATTRIBUTE
-#ifndef HASATTRIBUTE       /* disable GNU-cc attribute checking? */
-#ifdef  __attribute__      /* Avoid possible redefinition errors */
-#undef  __attribute__
-#endif
-#define __attribute__(attr)
-#endif
-#endif
-
-#ifndef PerlIO_stdoutf
-extern int	PerlIO_stdoutf		(const char *,...)
-					__attribute__((format (printf, 1, 2)));
-#endif
-#ifndef PerlIO_puts
-extern int	PerlIO_puts		(PerlIO *,const char *);
-#endif
-#ifndef PerlIO_open
-extern PerlIO *	PerlIO_open		(const char *,const char *);
-#endif
-#ifndef PerlIO_close
-extern int	PerlIO_close		(PerlIO *);
-#endif
-#ifndef PerlIO_eof
-extern int	PerlIO_eof		(PerlIO *);
-#endif
-#ifndef PerlIO_error
-extern int	PerlIO_error		(PerlIO *);
-#endif
-#ifndef PerlIO_clearerr
-extern void	PerlIO_clearerr		(PerlIO *);
-#endif
-#ifndef PerlIO_getc
-extern int	PerlIO_getc		(PerlIO *);
-#endif
-#ifndef PerlIO_putc
-extern int	PerlIO_putc		(PerlIO *,int);
-#endif
-#ifndef PerlIO_flush
-extern int	PerlIO_flush		(PerlIO *);
-#endif
-#ifndef PerlIO_ungetc
-extern int	PerlIO_ungetc		(PerlIO *,int);
-#endif
-#ifndef PerlIO_fileno
-extern int	PerlIO_fileno		(PerlIO *);
-#endif
-#ifndef PerlIO_fdopen
-extern PerlIO *	PerlIO_fdopen		(int, const char *);
-#endif
-#ifndef PerlIO_importFILE
-extern PerlIO *	PerlIO_importFILE	(FILE *,int);
-#endif
-#ifndef PerlIO_exportFILE
-extern FILE *	PerlIO_exportFILE	(PerlIO *,int);
-#endif
-#ifndef PerlIO_findFILE
-extern FILE *	PerlIO_findFILE		(PerlIO *);
-#endif
-#ifndef PerlIO_releaseFILE
-extern void	PerlIO_releaseFILE	(PerlIO *,FILE *);
-#endif
-#ifndef PerlIO_read
-extern SSize_t	PerlIO_read		(PerlIO *,void *,Size_t);
-#endif
-#ifndef PerlIO_write
-extern SSize_t	PerlIO_write		(PerlIO *,const void *,Size_t);
-#endif
-#ifndef PerlIO_setlinebuf
-extern void	PerlIO_setlinebuf	(PerlIO *);
-#endif
-#ifndef PerlIO_printf
-extern int	PerlIO_printf		(PerlIO *, const char *,...)
-					__attribute__((format (printf, 2, 3)));
-#endif
-#ifndef PerlIO_sprintf
-extern int	PerlIO_sprintf		(char *, int, const char *,...)
-					__attribute__((format (printf, 3, 4)));
-#endif
-#ifndef PerlIO_vprintf
-extern int	PerlIO_vprintf		(PerlIO *, const char *, va_list);
-#endif
-#ifndef PerlIO_tell
-extern Off_t	PerlIO_tell		(PerlIO *);
-#endif
-#ifndef PerlIO_seek
-extern int	PerlIO_seek		(PerlIO *, Off_t, int);
-#endif
-#ifndef PerlIO_rewind
-extern void	PerlIO_rewind		(PerlIO *);
-#endif
-#ifndef PerlIO_has_base
-extern int	PerlIO_has_base		(PerlIO *);
-#endif
-#ifndef PerlIO_has_cntptr
-extern int	PerlIO_has_cntptr	(PerlIO *);
-#endif
-#ifndef PerlIO_fast_gets
-extern int	PerlIO_fast_gets	(PerlIO *);
-#endif
-#ifndef PerlIO_canset_cnt
-extern int	PerlIO_canset_cnt	(PerlIO *);
-#endif
-#ifndef PerlIO_get_ptr
-extern STDCHAR * PerlIO_get_ptr		(PerlIO *);
-#endif
-#ifndef PerlIO_get_cnt
-extern int	PerlIO_get_cnt		(PerlIO *);
-#endif
-#ifndef PerlIO_set_cnt
-extern void	PerlIO_set_cnt		(PerlIO *,int);
-#endif
-#ifndef PerlIO_set_ptrcnt
-extern void	PerlIO_set_ptrcnt	(PerlIO *,STDCHAR *,int);
-#endif
-#ifndef PerlIO_get_base
-extern STDCHAR * PerlIO_get_base	(PerlIO *);
-#endif
-#ifndef PerlIO_get_bufsiz
-extern int	PerlIO_get_bufsiz	(PerlIO *);
-#endif
-#ifndef PerlIO_tmpfile
-extern PerlIO *	PerlIO_tmpfile		(void);
-#endif
-#ifndef PerlIO_stdin
-extern PerlIO *	PerlIO_stdin	(void);
-#endif
-#ifndef PerlIO_stdout
-extern PerlIO *	PerlIO_stdout	(void);
-#endif
-#ifndef PerlIO_stderr
-extern PerlIO *	PerlIO_stderr	(void);
-#endif
-#ifndef PerlIO_getpos
-extern int	PerlIO_getpos		(PerlIO *,Fpos_t *);
+#define init_os_extras()						\
+	(*PL_StdIO->pInitOSExtras)(PL_StdIO)
+#define PerlSIO_fdupopen(f)						\
+	(*PL_StdIO->pFdupopen)(PL_StdIO, (f))
+
+#else	/* PERL_IMPLICIT_SYS */
+
+#define PerlSIO_stdin			stdin
+#define PerlSIO_stdout			stdout
+#define PerlSIO_stderr			stderr
+#define PerlSIO_fopen(x,y)		fopen(x,y)
+#define PerlSIO_fclose(f)		fclose(f)
+#define PerlSIO_feof(f)			feof(f)
+#define PerlSIO_ferror(f)		ferror(f)
+#define PerlSIO_clearerr(f)		clearerr(f)
+#define PerlSIO_fgetc(f)			fgetc(f)
+#ifdef FILE_base
+#define PerlSIO_get_base(f)		FILE_base(f)
+#define PerlSIO_get_bufsiz(f)		FILE_bufsiz(f)
+#else
+#define PerlSIO_get_base(f)		NULL
+#define PerlSIO_get_bufsiz(f)		0
 #endif
-#ifndef PerlIO_setpos
-extern int	PerlIO_setpos		(PerlIO *,const Fpos_t *);
+#ifdef USE_STDIO_PTR
+#define PerlSIO_get_cnt(f)		FILE_cnt(f)
+#define PerlSIO_get_ptr(f)		FILE_ptr(f)
+#else
+#define PerlSIO_get_cnt(f)		0
+#define PerlSIO_get_ptr(f)		NULL
+#endif
+#define PerlSIO_fputc(f,c)		fputc(c,f)
+#define PerlSIO_fputs(f,s)		fputs(s,f)
+#define PerlSIO_fflush(f)		Fflush(f)
+#define PerlSIO_fgets(s, n, fp)		fgets(s,n,fp)
+#if defined(VMS) && defined(__DECC)
+     /* Unusual definition of ungetc() here to accomodate fast_sv_gets()'
+      * belief that it can mix getc/ungetc with reads from stdio buffer */
+     int decc$ungetc(int __c, FILE *__stream);
+#    define PerlSIO_ungetc(c,f) ((c) == EOF ? EOF : \
+            ((*(f) && !((*(f))->_flag & _IONBF) && \
+            ((*(f))->_ptr > (*(f))->_base)) ? \
+            ((*(f))->_cnt++, *(--(*(f))->_ptr) = (c)) : decc$ungetc(c,f)))
+#else
+#  define PerlSIO_ungetc(c,f)          ungetc(c,f)
+#endif
+#define PerlSIO_fileno(f)		fileno(f)
+#define PerlSIO_fdopen(f, s)		fdopen(f,s)
+#define PerlSIO_freopen(p, m, f)	freopen(p,m,f)
+#define PerlSIO_fread(buf,sz,count,f)	fread(buf,sz,count,f)
+#define PerlSIO_fwrite(buf,sz,count,f)	fwrite(buf,sz,count,f)
+#define PerlSIO_setbuf(f,b)		setbuf(f,b)
+#define PerlSIO_setvbuf(f,b,t,s)	setvbuf(f,b,t,s)
+#if defined(USE_STDIO_PTR) && defined(STDIO_CNT_LVALUE)
+#define PerlSIO_set_cnt(f,c)		FILE_cnt(f) = (c)
+#else
+#define PerlSIO_set_cnt(f,c)		PerlIOProc_abort()
 #endif
-
+#if defined(USE_STDIO_PTR) && defined(STDIO_PTR_LVALUE)
+#define PerlSIO_set_ptr(f,p)		FILE_ptr(f) = (p)
+#else
+#define PerlSIO_set_ptr(f,p)		PerlIOProc_abort()
+#endif
+#define PerlSIO_setlinebuf(f)		setlinebuf(f)
+#define PerlSIO_printf			Perl_fprintf_nocontext
+#define PerlSIO_stdoutf			*PL_StdIO->pPrintf
+#define PerlSIO_vprintf(f,fmt,a)	
+#define PerlSIO_ftell(f)		ftell(f)
+#define PerlSIO_fseek(f,o,w)		fseek(f,o,w)
+#define PerlSIO_fgetpos(f,p)		fgetpos(f,p)
+#define PerlSIO_fsetpos(f,p)		fsetpos(f,p)
+#define PerlSIO_rewind(f)		rewind(f)
+#define PerlSIO_tmpfile()		tmpfile()
+#define PerlSIO_fdupopen(f)		(f)
+
+#endif	/* PERL_IMPLICIT_SYS */
 
 /*
  *   Interface for directory functions
  */
 
-#ifdef PERL_OBJECT
+#if defined(PERL_IMPLICIT_SYS)
 
 /* IPerlDir		*/
 struct IPerlDir;
+struct IPerlDirInfo;
 typedef int		(*LPMakedir)(struct IPerlDir*, const char*, int);
 typedef int		(*LPChdir)(struct IPerlDir*, const char*);
 typedef int		(*LPRmdir)(struct IPerlDir*, const char*);
@@ -479,6 +363,10 @@ typedef struct direct*	(*LPDirRead)(struct IPerlDir*, DIR*);
 typedef void		(*LPDirRewind)(struct IPerlDir*, DIR*);
 typedef void		(*LPDirSeek)(struct IPerlDir*, DIR*, long);
 typedef long		(*LPDirTell)(struct IPerlDir*, DIR*);
+#ifdef WIN32
+typedef char*		(*LPDirMapPathA)(struct IPerlDir*, const char*);
+typedef WCHAR*		(*LPDirMapPathW)(struct IPerlDir*, const WCHAR*);
+#endif
 
 struct IPerlDir
 {
@@ -491,6 +379,10 @@ struct IPerlDir
     LPDirRewind		pRewind;
     LPDirSeek		pSeek;
     LPDirTell		pTell;
+#ifdef WIN32
+    LPDirMapPathA	pMapPathA;
+    LPDirMapPathW	pMapPathW;
+#endif
 };
 
 struct IPerlDirInfo
@@ -500,30 +392,36 @@ struct IPerlDirInfo
 };
 
 #define PerlDir_mkdir(name, mode)				\
-	(*PL_piDir->pMakedir)(PL_piDir, (name), (mode))
+	(*PL_Dir->pMakedir)(PL_Dir, (name), (mode))
 #define PerlDir_chdir(name)					\
-	(*PL_piDir->pChdir)(PL_piDir, (name))
+	(*PL_Dir->pChdir)(PL_Dir, (name))
 #define PerlDir_rmdir(name)					\
-	(*PL_piDir->pRmdir)(PL_piDir, (name))
+	(*PL_Dir->pRmdir)(PL_Dir, (name))
 #define PerlDir_close(dir)					\
-	(*PL_piDir->pClose)(PL_piDir, (dir))
+	(*PL_Dir->pClose)(PL_Dir, (dir))
 #define PerlDir_open(name)					\
-	(*PL_piDir->pOpen)(PL_piDir, (name))
+	(*PL_Dir->pOpen)(PL_Dir, (name))
 #define PerlDir_read(dir)					\
-	(*PL_piDir->pRead)(PL_piDir, (dir))
+	(*PL_Dir->pRead)(PL_Dir, (dir))
 #define PerlDir_rewind(dir)					\
-	(*PL_piDir->pRewind)(PL_piDir, (dir))
+	(*PL_Dir->pRewind)(PL_Dir, (dir))
 #define PerlDir_seek(dir, loc)					\
-	(*PL_piDir->pSeek)(PL_piDir, (dir), (loc))
+	(*PL_Dir->pSeek)(PL_Dir, (dir), (loc))
 #define PerlDir_tell(dir)					\
-	(*PL_piDir->pTell)(PL_piDir, (dir))
+	(*PL_Dir->pTell)(PL_Dir, (dir))
+#ifdef WIN32
+#define PerlDir_mapA(dir)					\
+	(*PL_Dir->pMapPathA)(PL_Dir, (dir))
+#define PerlDir_mapW(dir)					\
+	(*PL_Dir->pMapPathW)(PL_Dir, (dir))
+#endif
 
-#else	/* PERL_OBJECT */
+#else	/* PERL_IMPLICIT_SYS */
 
 #define PerlDir_mkdir(name, mode)	Mkdir((name), (mode))
 #ifdef VMS
-#  define PerlDir_chdir(n)		chdir(((n) && *(n)) ? (n) : "SYS$LOGIN")
-#else 
+#  define PerlDir_chdir(n)		Chdir(((n) && *(n)) ? (n) : "SYS$LOGIN")
+#else
 #  define PerlDir_chdir(name)		chdir((name))
 #endif
 #define PerlDir_rmdir(name)		rmdir((name))
@@ -533,32 +431,43 @@ struct IPerlDirInfo
 #define PerlDir_rewind(dir)		rewinddir((dir))
 #define PerlDir_seek(dir, loc)		seekdir((dir), (loc))
 #define PerlDir_tell(dir)		telldir((dir))
+#ifdef WIN32
+#define PerlDir_mapA(dir)		dir
+#define PerlDir_mapW(dir)		dir
+#endif
 
-#endif	/* PERL_OBJECT */
+#endif	/* PERL_IMPLICIT_SYS */
 
 /*
     Interface for perl environment functions
 */
 
-#ifdef PERL_OBJECT
+#if defined(PERL_IMPLICIT_SYS)
 
 /* IPerlEnv		*/
 struct IPerlEnv;
+struct IPerlEnvInfo;
 typedef char*		(*LPEnvGetenv)(struct IPerlEnv*, const char*);
 typedef int		(*LPEnvPutenv)(struct IPerlEnv*, const char*);
-typedef char *		(*LPEnvGetenv_len)(struct IPerlEnv*,
+typedef char*		(*LPEnvGetenv_len)(struct IPerlEnv*,
 				    const char *varname, unsigned long *len);
 typedef int		(*LPEnvUname)(struct IPerlEnv*, struct utsname *name);
 typedef void		(*LPEnvClearenv)(struct IPerlEnv*);
-typedef unsigned long	(*LPEnvOsID)(struct IPerlEnv*);
+typedef void*		(*LPEnvGetChildenv)(struct IPerlEnv*);
+typedef void		(*LPEnvFreeChildenv)(struct IPerlEnv*, void* env);
+typedef char*		(*LPEnvGetChilddir)(struct IPerlEnv*);
+typedef void		(*LPEnvFreeChilddir)(struct IPerlEnv*, char* dir);
 #ifdef HAS_ENVGETENV
-typedef char *		(*LPENVGetenv)(struct IPerlEnv*, const char *varname);
-typedef char *		(*LPENVGetenv_len)(struct IPerlEnv*,
+typedef char*		(*LPENVGetenv)(struct IPerlEnv*, const char *varname);
+typedef char*		(*LPENVGetenv_len)(struct IPerlEnv*,
 				    const char *varname, unsigned long *len);
 #endif
 #ifdef WIN32
-typedef char*		(*LPEnvLibPath)(struct IPerlEnv*, char*);
-typedef char*		(*LPEnvSiteLibPath)(struct IPerlEnv*, char*);
+typedef unsigned long	(*LPEnvOsID)(struct IPerlEnv*);
+typedef char*		(*LPEnvLibPath)(struct IPerlEnv*, const char*);
+typedef char*		(*LPEnvSiteLibPath)(struct IPerlEnv*, const char*);
+typedef char*		(*LPEnvVendorLibPath)(struct IPerlEnv*, const char*);
+typedef void		(*LPEnvGetChildIO)(struct IPerlEnv*, child_IO_table*);
 #endif
 
 struct IPerlEnv
@@ -568,6 +477,10 @@ struct IPerlEnv
     LPEnvGetenv_len	pGetenv_len;
     LPEnvUname		pEnvUname;
     LPEnvClearenv	pClearenv;
+    LPEnvGetChildenv	pGetChildenv;
+    LPEnvFreeChildenv	pFreeChildenv;
+    LPEnvGetChilddir	pGetChilddir;
+    LPEnvFreeChilddir	pFreeChilddir;
 #ifdef HAS_ENVGETENV
     LPENVGetenv		pENVGetenv;
     LPENVGetenv_len	pENVGetenv_len;
@@ -576,6 +489,8 @@ struct IPerlEnv
     LPEnvOsID		pEnvOsID;
     LPEnvLibPath	pLibPath;
     LPEnvSiteLibPath	pSiteLibPath;
+    LPEnvVendorLibPath	pVendorLibPath;
+    LPEnvGetChildIO	pGetChildIO;
 #endif
 };
 
@@ -586,20 +501,26 @@ struct IPerlEnvInfo
 };
 
 #define PerlEnv_putenv(str)					\
-	(*PL_piENV->pPutenv)(PL_piENV,(str))
+	(*PL_Env->pPutenv)(PL_Env,(str))
 #define PerlEnv_getenv(str)					\
-	(*PL_piENV->pGetenv)(PL_piENV,(str))
+	(*PL_Env->pGetenv)(PL_Env,(str))
 #define PerlEnv_getenv_len(str,l)				\
-	(*PL_piENV->pGetenv_len)(PL_piENV,(str), (l))
-#define PerlEnv_Clear()						\
-	(*PL_piENV->pClearenv)(PL_piENV)
-#define PerlEnv_Clear()						\
-	(*PL_piENV->pClearenv)(PL_piENV)
+	(*PL_Env->pGetenv_len)(PL_Env,(str), (l))
+#define PerlEnv_clearenv()					\
+	(*PL_Env->pClearenv)(PL_Env)
+#define PerlEnv_get_childenv()					\
+	(*PL_Env->pGetChildenv)(PL_Env)
+#define PerlEnv_free_childenv(e)				\
+	(*PL_Env->pFreeChildenv)(PL_Env, (e))
+#define PerlEnv_get_childdir()					\
+	(*PL_Env->pGetChilddir)(PL_Env)
+#define PerlEnv_free_childdir(d)				\
+	(*PL_Env->pFreeChilddir)(PL_Env, (d))
 #ifdef HAS_ENVGETENV
 #  define PerlEnv_ENVgetenv(str)				\
-	(*PL_piENV->pENVGetenv)(PL_piENV,(str))
+	(*PL_Env->pENVGetenv)(PL_Env,(str))
 #  define PerlEnv_ENVgetenv_len(str,l)				\
-	(*PL_piENV->pENVGetenv_len)(PL_piENV,(str), (l))
+	(*PL_Env->pENVGetenv_len)(PL_Env,(str), (l))
 #else
 #  define PerlEnv_ENVgetenv(str)				\
 	PerlEnv_getenv((str))
@@ -607,21 +528,30 @@ struct IPerlEnvInfo
 	PerlEnv_getenv_len((str),(l))
 #endif
 #define PerlEnv_uname(name)					\
-	(*PL_piENV->pEnvUname)(PL_piENV,(name))
+	(*PL_Env->pEnvUname)(PL_Env,(name))
 #ifdef WIN32
 #define PerlEnv_os_id()						\
-	(*PL_piENV->pEnvOsID)(PL_piENV)
+	(*PL_Env->pEnvOsID)(PL_Env)
 #define PerlEnv_lib_path(str)					\
-	(*PL_piENV->pLibPath)(PL_piENV,(str))
+	(*PL_Env->pLibPath)(PL_Env,(str))
 #define PerlEnv_sitelib_path(str)				\
-	(*PL_piENV->pSiteLibPath)(PL_piENV,(str))
+	(*PL_Env->pSiteLibPath)(PL_Env,(str))
+#define PerlEnv_vendorlib_path(str)				\
+	(*PL_Env->pVendorLibPath)(PL_Env,(str))
+#define PerlEnv_get_child_IO(ptr)				\
+	(*PL_Env->pGetChildIO)(PL_Env, ptr)
 #endif
 
-#else	/* PERL_OBJECT */
+#else	/* PERL_IMPLICIT_SYS */
 
 #define PerlEnv_putenv(str)		putenv((str))
 #define PerlEnv_getenv(str)		getenv((str))
 #define PerlEnv_getenv_len(str,l)	getenv_len((str), (l))
+#define PerlEnv_clearenv()		clearenv()
+#define PerlEnv_get_childenv()		get_childenv()
+#define PerlEnv_free_childenv(e)	free_childenv((e))
+#define PerlEnv_get_childdir()		get_childdir()
+#define PerlEnv_free_childdir(d)	free_childdir((d))
 #ifdef HAS_ENVGETENV
 #  define PerlEnv_ENVgetenv(str)	ENVgetenv((str))
 #  define PerlEnv_ENVgetenv_len(str,l)	ENVgetenv_len((str), (l))
@@ -633,18 +563,23 @@ struct IPerlEnvInfo
 
 #ifdef WIN32
 #define PerlEnv_os_id()			win32_os_id()
+#define PerlEnv_lib_path(str)		win32_get_privlib(str)
+#define PerlEnv_sitelib_path(str)	win32_get_sitelib(str)
+#define PerlEnv_vendorlib_path(str)	win32_get_vendorlib(str)
+#define PerlEnv_get_child_IO(ptr)	win32_get_child_IO(ptr)
 #endif
 
-#endif	/* PERL_OBJECT */
+#endif	/* PERL_IMPLICIT_SYS */
 
 /*
     Interface for perl low-level IO functions
 */
 
-#ifdef PERL_OBJECT
+#if defined(PERL_IMPLICIT_SYS)
 
 /* IPerlLIO		*/
 struct IPerlLIO;
+struct IPerlLIOInfo;
 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,
@@ -658,6 +593,8 @@ typedef int		(*LPLIOFileStat)(struct IPerlLIO*, int, struct stat*);
 typedef int		(*LPLIOIOCtl)(struct IPerlLIO*, int, unsigned int,
 			    char*);
 typedef int		(*LPLIOIsatty)(struct IPerlLIO*, int);
+typedef int		(*LPLIOLink)(struct IPerlLIO*, const char*,
+				     const char *);
 typedef long		(*LPLIOLseek)(struct IPerlLIO*, int, long, int);
 typedef int		(*LPLIOLstat)(struct IPerlLIO*, const char*,
 			    struct stat*);
@@ -667,7 +604,11 @@ typedef int		(*LPLIOOpen3)(struct IPerlLIO*, const char*, int, int);
 typedef int		(*LPLIORead)(struct IPerlLIO*, int, void*, unsigned int);
 typedef int		(*LPLIORename)(struct IPerlLIO*, const char*,
 			    const char*);
+#ifdef NETWARE
+typedef int		(*LPLIOSetmode)(struct IPerlLIO*, FILE*, int);
+#else
 typedef int		(*LPLIOSetmode)(struct IPerlLIO*, int, int);
+#endif	/* NETWARE */
 typedef int		(*LPLIONameStat)(struct IPerlLIO*, const char*,
 			    struct stat*);
 typedef char*		(*LPLIOTmpnam)(struct IPerlLIO*, char*);
@@ -690,6 +631,7 @@ struct IPerlLIO
     LPLIOFileStat	pFileStat;
     LPLIOIOCtl		pIOCtl;
     LPLIOIsatty		pIsatty;
+    LPLIOLink		pLink;
     LPLIOLseek		pLseek;
     LPLIOLstat		pLstat;
     LPLIOMktemp		pMktemp;
@@ -713,57 +655,59 @@ struct IPerlLIOInfo
 };
 
 #define PerlLIO_access(file, mode)					\
-	(*PL_piLIO->pAccess)(PL_piLIO, (file), (mode))
+	(*PL_LIO->pAccess)(PL_LIO, (file), (mode))
 #define PerlLIO_chmod(file, mode)					\
-	(*PL_piLIO->pChmod)(PL_piLIO, (file), (mode))
+	(*PL_LIO->pChmod)(PL_LIO, (file), (mode))
 #define PerlLIO_chown(file, owner, group)				\
-	(*PL_piLIO->pChown)(PL_piLIO, (file), (owner), (group))
+	(*PL_LIO->pChown)(PL_LIO, (file), (owner), (group))
 #define PerlLIO_chsize(fd, size)					\
-	(*PL_piLIO->pChsize)(PL_piLIO, (fd), (size))
+	(*PL_LIO->pChsize)(PL_LIO, (fd), (size))
 #define PerlLIO_close(fd)						\
-	(*PL_piLIO->pClose)(PL_piLIO, (fd))
+	(*PL_LIO->pClose)(PL_LIO, (fd))
 #define PerlLIO_dup(fd)							\
-	(*PL_piLIO->pDup)(PL_piLIO, (fd))
+	(*PL_LIO->pDup)(PL_LIO, (fd))
 #define PerlLIO_dup2(fd1, fd2)						\
-	(*PL_piLIO->pDup2)(PL_piLIO, (fd1), (fd2))
+	(*PL_LIO->pDup2)(PL_LIO, (fd1), (fd2))
 #define PerlLIO_flock(fd, op)						\
-	(*PL_piLIO->pFlock)(PL_piLIO, (fd), (op))
+	(*PL_LIO->pFlock)(PL_LIO, (fd), (op))
 #define PerlLIO_fstat(fd, buf)						\
-	(*PL_piLIO->pFileStat)(PL_piLIO, (fd), (buf))
+	(*PL_LIO->pFileStat)(PL_LIO, (fd), (buf))
 #define PerlLIO_ioctl(fd, u, buf)					\
-	(*PL_piLIO->pIOCtl)(PL_piLIO, (fd), (u), (buf))
+	(*PL_LIO->pIOCtl)(PL_LIO, (fd), (u), (buf))
 #define PerlLIO_isatty(fd)						\
-	(*PL_piLIO->pIsatty)(PL_piLIO, (fd))
+	(*PL_LIO->pIsatty)(PL_LIO, (fd))
+#define PerlLIO_link(oldname, newname)					\
+	(*PL_LIO->pLink)(PL_LIO, (oldname), (newname))
 #define PerlLIO_lseek(fd, offset, mode)					\
-	(*PL_piLIO->pLseek)(PL_piLIO, (fd), (offset), (mode))
+	(*PL_LIO->pLseek)(PL_LIO, (fd), (offset), (mode))
 #define PerlLIO_lstat(name, buf)					\
-	(*PL_piLIO->pLstat)(PL_piLIO, (name), (buf))
+	(*PL_LIO->pLstat)(PL_LIO, (name), (buf))
 #define PerlLIO_mktemp(file)						\
-	(*PL_piLIO->pMktemp)(PL_piLIO, (file))
+	(*PL_LIO->pMktemp)(PL_LIO, (file))
 #define PerlLIO_open(file, flag)					\
-	(*PL_piLIO->pOpen)(PL_piLIO, (file), (flag))
+	(*PL_LIO->pOpen)(PL_LIO, (file), (flag))
 #define PerlLIO_open3(file, flag, perm)					\
-	(*PL_piLIO->pOpen3)(PL_piLIO, (file), (flag), (perm))
+	(*PL_LIO->pOpen3)(PL_LIO, (file), (flag), (perm))
 #define PerlLIO_read(fd, buf, count)					\
-	(*PL_piLIO->pRead)(PL_piLIO, (fd), (buf), (count))
+	(*PL_LIO->pRead)(PL_LIO, (fd), (buf), (count))
 #define PerlLIO_rename(oname, newname)					\
-	(*PL_piLIO->pRename)(PL_piLIO, (oname), (newname))
+	(*PL_LIO->pRename)(PL_LIO, (oname), (newname))
 #define PerlLIO_setmode(fd, mode)					\
-	(*PL_piLIO->pSetmode)(PL_piLIO, (fd), (mode))
+	(*PL_LIO->pSetmode)(PL_LIO, (fd), (mode))
 #define PerlLIO_stat(name, buf)						\
-	(*PL_piLIO->pNameStat)(PL_piLIO, (name), (buf))
+	(*PL_LIO->pNameStat)(PL_LIO, (name), (buf))
 #define PerlLIO_tmpnam(str)						\
-	(*PL_piLIO->pTmpnam)(PL_piLIO, (str))
+	(*PL_LIO->pTmpnam)(PL_LIO, (str))
 #define PerlLIO_umask(mode)						\
-	(*PL_piLIO->pUmask)(PL_piLIO, (mode))
+	(*PL_LIO->pUmask)(PL_LIO, (mode))
 #define PerlLIO_unlink(file)						\
-	(*PL_piLIO->pUnlink)(PL_piLIO, (file))
+	(*PL_LIO->pUnlink)(PL_LIO, (file))
 #define PerlLIO_utime(file, time)					\
-	(*PL_piLIO->pUtime)(PL_piLIO, (file), (time))
+	(*PL_LIO->pUtime)(PL_LIO, (file), (time))
 #define PerlLIO_write(fd, buf, count)					\
-	(*PL_piLIO->pWrite)(PL_piLIO, (fd), (buf), (count))
+	(*PL_LIO->pWrite)(PL_LIO, (fd), (buf), (count))
 
-#else	/* PERL_OBJECT */
+#else	/* PERL_IMPLICIT_SYS */
 
 #define PerlLIO_access(file, mode)	access((file), (mode))
 #define PerlLIO_chmod(file, mode)	chmod((file), (mode))
@@ -776,6 +720,7 @@ struct IPerlLIOInfo
 #define PerlLIO_fstat(fd, buf)		Fstat((fd), (buf))
 #define PerlLIO_ioctl(fd, u, buf)	ioctl((fd), (u), (buf))
 #define PerlLIO_isatty(fd)		isatty((fd))
+#define PerlLIO_link(oldname, newname)	link((oldname), (newname))
 #define PerlLIO_lseek(fd, offset, mode)	lseek((fd), (offset), (mode))
 #define PerlLIO_stat(name, buf)		Stat((name), (buf))
 #ifdef HAS_LSTAT
@@ -796,25 +741,34 @@ struct IPerlLIOInfo
 #define PerlLIO_utime(file, time)	utime((file), (time))
 #define PerlLIO_write(fd, buf, count)	write((fd), (buf), (count))
 
-#endif	/* PERL_OBJECT */
+#endif	/* PERL_IMPLICIT_SYS */
 
 /*
     Interface for perl memory allocation
 */
 
-#ifdef PERL_OBJECT
+#if defined(PERL_IMPLICIT_SYS)
 
 /* IPerlMem		*/
 struct IPerlMem;
+struct IPerlMemInfo;
 typedef void*		(*LPMemMalloc)(struct IPerlMem*, size_t);
 typedef void*		(*LPMemRealloc)(struct IPerlMem*, void*, size_t);
 typedef void		(*LPMemFree)(struct IPerlMem*, void*);
+typedef void*		(*LPMemCalloc)(struct IPerlMem*, size_t, size_t);
+typedef void		(*LPMemGetLock)(struct IPerlMem*);
+typedef void		(*LPMemFreeLock)(struct IPerlMem*);
+typedef int		(*LPMemIsLocked)(struct IPerlMem*);
 
 struct IPerlMem
 {
     LPMemMalloc		pMalloc;
     LPMemRealloc	pRealloc;
     LPMemFree		pFree;
+    LPMemCalloc		pCalloc;
+    LPMemGetLock	pGetLock;
+    LPMemFreeLock	pFreeLock;
+    LPMemIsLocked	pIsLocked;
 };
 
 struct IPerlMemInfo
@@ -823,37 +777,101 @@ struct IPerlMemInfo
     struct IPerlMem	perlMemList;
 };
 
+/* Interpreter specific memory macros */
 #define PerlMem_malloc(size)				    \
-	(*PL_piMem->pMalloc)(PL_piMem, (size))
+	(*PL_Mem->pMalloc)(PL_Mem, (size))
 #define PerlMem_realloc(buf, size)			    \
-	(*PL_piMem->pRealloc)(PL_piMem, (buf), (size))
+	(*PL_Mem->pRealloc)(PL_Mem, (buf), (size))
 #define PerlMem_free(buf)				    \
-	(*PL_piMem->pFree)(PL_piMem, (buf))
-
-#else	/* PERL_OBJECT */
-
+	(*PL_Mem->pFree)(PL_Mem, (buf))
+#define PerlMem_calloc(num, size)			    \
+	(*PL_Mem->pCalloc)(PL_Mem, (num), (size))
+#define PerlMem_get_lock()				    \
+	(*PL_Mem->pGetLock)(PL_Mem)
+#define PerlMem_free_lock()				    \
+	(*PL_Mem->pFreeLock)(PL_Mem)
+#define PerlMem_is_locked()				    \
+	(*PL_Mem->pIsLocked)(PL_Mem)
+
+/* Shared memory macros */
+#define PerlMemShared_malloc(size)			    \
+	(*PL_MemShared->pMalloc)(PL_MemShared, (size))
+#define PerlMemShared_realloc(buf, size)		    \
+	(*PL_MemShared->pRealloc)(PL_MemShared, (buf), (size))
+#define PerlMemShared_free(buf)				    \
+	(*PL_MemShared->pFree)(PL_MemShared, (buf))
+#define PerlMemShared_calloc(num, size)			    \
+	(*PL_MemShared->pCalloc)(PL_MemShared, (num), (size))
+#define PerlMemShared_get_lock()			    \
+	(*PL_MemShared->pGetLock)(PL_MemShared)
+#define PerlMemShared_free_lock()			    \
+	(*PL_MemShared->pFreeLock)(PL_MemShared)
+#define PerlMemShared_is_locked()			    \
+	(*PL_MemShared->pIsLocked)(PL_MemShared)
+
+
+/* Parse tree memory macros */
+#define PerlMemParse_malloc(size)			    \
+	(*PL_MemParse->pMalloc)(PL_MemParse, (size))
+#define PerlMemParse_realloc(buf, size)			    \
+	(*PL_MemParse->pRealloc)(PL_MemParse, (buf), (size))
+#define PerlMemParse_free(buf)				    \
+	(*PL_MemParse->pFree)(PL_MemParse, (buf))
+#define PerlMemParse_calloc(num, size)			    \
+	(*PL_MemParse->pCalloc)(PL_MemParse, (num), (size))
+#define PerlMemParse_get_lock()				    \
+	(*PL_MemParse->pGetLock)(PL_MemParse)
+#define PerlMemParse_free_lock()			    \
+	(*PL_MemParse->pFreeLock)(PL_MemParse)
+#define PerlMemParse_is_locked()			    \
+	(*PL_MemParse->pIsLocked)(PL_MemParse)
+
+
+#else	/* PERL_IMPLICIT_SYS */
+
+/* Interpreter specific memory macros */
 #define PerlMem_malloc(size)		malloc((size))
 #define PerlMem_realloc(buf, size)	realloc((buf), (size))
 #define PerlMem_free(buf)		free((buf))
-
-#endif	/* PERL_OBJECT */
+#define PerlMem_calloc(num, size)	calloc((num), (size))
+#define PerlMem_get_lock()		
+#define PerlMem_free_lock()
+#define PerlMem_is_locked()		0
+
+/* Shared memory macros */
+#define PerlMemShared_malloc(size)		malloc((size))
+#define PerlMemShared_realloc(buf, size)	realloc((buf), (size))
+#define PerlMemShared_free(buf)			free((buf))
+#define PerlMemShared_calloc(num, size)		calloc((num), (size))
+#define PerlMemShared_get_lock()		
+#define PerlMemShared_free_lock()
+#define PerlMemShared_is_locked()		0
+
+/* Parse tree memory macros */
+#define PerlMemParse_malloc(size)	malloc((size))
+#define PerlMemParse_realloc(buf, size)	realloc((buf), (size))
+#define PerlMemParse_free(buf)		free((buf))
+#define PerlMemParse_calloc(num, size)	calloc((num), (size))
+#define PerlMemParse_get_lock()		
+#define PerlMemParse_free_lock()
+#define PerlMemParse_is_locked()	0
+
+#endif	/* PERL_IMPLICIT_SYS */
 
 /*
     Interface for perl process functions
 */
 
 
-#ifdef PERL_OBJECT
+#if defined(PERL_IMPLICIT_SYS)
 
-#ifndef Sighandler_t
-typedef Signal_t (*Sighandler_t) (int);
-#endif
 #ifndef jmp_buf
 #include <setjmp.h>
 #endif
 
 /* IPerlProc		*/
 struct IPerlProc;
+struct IPerlProcInfo;
 typedef void		(*LPProcAbort)(struct IPerlProc*);
 typedef char*		(*LPProcCrypt)(struct IPerlProc*, const char*,
 			    const char*);
@@ -876,6 +894,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);
@@ -885,8 +905,10 @@ typedef int		(*LPProcTimes)(struct IPerlProc*, struct tms*);
 typedef int		(*LPProcWait)(struct IPerlProc*, int*);
 typedef int		(*LPProcWaitpid)(struct IPerlProc*, int, int*, int);
 typedef Sighandler_t	(*LPProcSignal)(struct IPerlProc*, int, Sighandler_t);
-typedef void*		(*LPProcDynaLoader)(struct IPerlProc*, const char*);
+typedef int		(*LPProcFork)(struct IPerlProc*);
+typedef int		(*LPProcGetpid)(struct IPerlProc*);
 #ifdef WIN32
+typedef void*		(*LPProcDynaLoader)(struct IPerlProc*, const char*);
 typedef void		(*LPProcGetOSError)(struct IPerlProc*,
 			    SV* sv, DWORD dwErr);
 typedef void		(*LPProcFreeBuf)(struct IPerlProc*, char*);
@@ -896,6 +918,7 @@ 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*);
 
 struct IPerlProc
 {
@@ -924,6 +947,8 @@ struct IPerlProc
     LPProcWait		pWait;
     LPProcWaitpid	pWaitpid;
     LPProcSignal	pSignal;
+    LPProcFork		pFork;
+    LPProcGetpid	pGetpid;
 #ifdef WIN32
     LPProcDynaLoader	pDynaLoader;
     LPProcGetOSError	pGetOSError;
@@ -932,6 +957,8 @@ struct IPerlProc
     LPProcSpawnvp	pSpawnvp;
     LPProcASpawn	pASpawn;
 #endif
+    LPProcLastHost      pLastHost;
+    LPProcPopenList	pPopenList;
 };
 
 struct IPerlProcInfo
@@ -941,74 +968,82 @@ struct IPerlProcInfo
 };
 
 #define PerlProc_abort()						\
-	(*PL_piProc->pAbort)(PL_piProc)
+	(*PL_Proc->pAbort)(PL_Proc)
 #define PerlProc_crypt(c,s)						\
-	(*PL_piProc->pCrypt)(PL_piProc, (c), (s))
+	(*PL_Proc->pCrypt)(PL_Proc, (c), (s))
 #define PerlProc_exit(s)						\
-	(*PL_piProc->pExit)(PL_piProc, (s))
+	(*PL_Proc->pExit)(PL_Proc, (s))
 #define PerlProc__exit(s)						\
-	(*PL_piProc->p_Exit)(PL_piProc, (s))
+	(*PL_Proc->p_Exit)(PL_Proc, (s))
 #define PerlProc_execl(c, w, x, y, z)					\
-	(*PL_piProc->pExecl)(PL_piProc, (c), (w), (x), (y), (z))
+	(*PL_Proc->pExecl)(PL_Proc, (c), (w), (x), (y), (z))
 #define PerlProc_execv(c, a)						\
-	(*PL_piProc->pExecv)(PL_piProc, (c), (a))
+	(*PL_Proc->pExecv)(PL_Proc, (c), (a))
 #define PerlProc_execvp(c, a)						\
-	(*PL_piProc->pExecvp)(PL_piProc, (c), (a))
+	(*PL_Proc->pExecvp)(PL_Proc, (c), (a))
 #define PerlProc_getuid()						\
-	(*PL_piProc->pGetuid)(PL_piProc)
+	(*PL_Proc->pGetuid)(PL_Proc)
 #define PerlProc_geteuid()						\
-	(*PL_piProc->pGeteuid)(PL_piProc)
+	(*PL_Proc->pGeteuid)(PL_Proc)
 #define PerlProc_getgid()						\
-	(*PL_piProc->pGetgid)(PL_piProc)
+	(*PL_Proc->pGetgid)(PL_Proc)
 #define PerlProc_getegid()						\
-	(*PL_piProc->pGetegid)(PL_piProc)
+	(*PL_Proc->pGetegid)(PL_Proc)
 #define PerlProc_getlogin()						\
-	(*PL_piProc->pGetlogin)(PL_piProc)
+	(*PL_Proc->pGetlogin)(PL_Proc)
 #define PerlProc_kill(i, a)						\
-	(*PL_piProc->pKill)(PL_piProc, (i), (a))
+	(*PL_Proc->pKill)(PL_Proc, (i), (a))
 #define PerlProc_killpg(i, a)						\
-	(*PL_piProc->pKillpg)(PL_piProc, (i), (a))
+	(*PL_Proc->pKillpg)(PL_Proc, (i), (a))
 #define PerlProc_pause()						\
-	(*PL_piProc->pPauseProc)(PL_piProc)
+	(*PL_Proc->pPauseProc)(PL_Proc)
 #define PerlProc_popen(c, m)						\
-	(*PL_piProc->pPopen)(PL_piProc, (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_piProc->pPclose)(PL_piProc, (f))
+	(*PL_Proc->pPclose)(PL_Proc, (f))
 #define PerlProc_pipe(fd)						\
-	(*PL_piProc->pPipe)(PL_piProc, (fd))
+	(*PL_Proc->pPipe)(PL_Proc, (fd))
 #define PerlProc_setuid(u)						\
-	(*PL_piProc->pSetuid)(PL_piProc, (u))
+	(*PL_Proc->pSetuid)(PL_Proc, (u))
 #define PerlProc_setgid(g)						\
-	(*PL_piProc->pSetgid)(PL_piProc, (g))
+	(*PL_Proc->pSetgid)(PL_Proc, (g))
 #define PerlProc_sleep(t)						\
-	(*PL_piProc->pSleep)(PL_piProc, (t))
+	(*PL_Proc->pSleep)(PL_Proc, (t))
 #define PerlProc_times(t)						\
-	(*PL_piProc->pTimes)(PL_piProc, (t))
+	(*PL_Proc->pTimes)(PL_Proc, (t))
 #define PerlProc_wait(t)						\
-	(*PL_piProc->pWait)(PL_piProc, (t))
+	(*PL_Proc->pWait)(PL_Proc, (t))
 #define PerlProc_waitpid(p,s,f)						\
-	(*PL_piProc->pWaitpid)(PL_piProc, (p), (s), (f))
+	(*PL_Proc->pWaitpid)(PL_Proc, (p), (s), (f))
 #define PerlProc_signal(n, h)						\
-	(*PL_piProc->pSignal)(PL_piProc, (n), (h))
+	(*PL_Proc->pSignal)(PL_Proc, (n), (h))
+#define PerlProc_fork()							\
+	(*PL_Proc->pFork)(PL_Proc)
+#define PerlProc_getpid()						\
+	(*PL_Proc->pGetpid)(PL_Proc)
 #define PerlProc_setjmp(b, n) Sigsetjmp((b), (n))
 #define PerlProc_longjmp(b, n) Siglongjmp((b), (n))
 
 #ifdef WIN32
 #define PerlProc_DynaLoad(f)						\
-	(*PL_piProc->pDynaLoader)(PL_piProc, (f))
+	(*PL_Proc->pDynaLoader)(PL_Proc, (f))
 #define PerlProc_GetOSError(s,e)					\
-	(*PL_piProc->pGetOSError)(PL_piProc, (s), (e))
+	(*PL_Proc->pGetOSError)(PL_Proc, (s), (e))
 #define PerlProc_Cmd(s)							\
-	(*PL_piProc->pDoCmd)(PL_piProc, (s))
+	(*PL_Proc->pDoCmd)(PL_Proc, (s))
 #define do_spawn(s)							\
-	(*PL_piProc->pSpawn)(PL_piProc, (s))
+	(*PL_Proc->pSpawn)(PL_Proc, (s))
 #define do_spawnvp(m, c, a)						\
-	(*PL_piProc->pSpawnvp)(PL_piProc, (m), (c), (a))
+	(*PL_Proc->pSpawnvp)(PL_Proc, (m), (c), (a))
 #define PerlProc_aspawn(m,c,a)						\
-	(*PL_piProc->pASpawn)(PL_piProc, (m), (c), (a))
+	(*PL_Proc->pASpawn)(PL_Proc, (m), (c), (a))
 #endif
+#define PerlProc_lasthost()						\
+	(*PL_Proc->pLastHost)(PL_Proc)
 
-#else	/* PERL_OBJECT */
+#else	/* PERL_IMPLICIT_SYS */
 
 #define PerlProc_abort()	abort()
 #define PerlProc_crypt(c,s)	crypt((c), (s))
@@ -1027,6 +1062,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))
@@ -1038,23 +1074,26 @@ struct IPerlProcInfo
 #define PerlProc_setjmp(b, n)	Sigsetjmp((b), (n))
 #define PerlProc_longjmp(b, n)	Siglongjmp((b), (n))
 #define PerlProc_signal(n, h)	signal((n), (h))
+#define PerlProc_fork()		fork()
+#define PerlProc_getpid()	getpid()
 
 #ifdef WIN32
 #define PerlProc_DynaLoad(f)						\
-	win32_dynaload(aTHX_ const char*filename)
+	win32_dynaload((f))
 #define PerlProc_GetOSError(s,e)					\
-	win32_str_os_error(aTHX_ (s), (e))
+	win32_str_os_error((s), (e))
 #endif
-#endif	/* PERL_OBJECT */
+#endif	/* PERL_IMPLICIT_SYS */
 
 /*
     Interface for perl socket functions
 */
 
-#ifdef PERL_OBJECT
+#if defined(PERL_IMPLICIT_SYS)
 
 /* PerlSock		*/
 struct IPerlSock;
+struct IPerlSockInfo;
 typedef u_long		(*LPHtonl)(struct IPerlSock*, u_long);
 typedef u_short		(*LPHtons)(struct IPerlSock*, u_short);
 typedef u_long		(*LPNtohl)(struct IPerlSock*, u_long);
@@ -1100,7 +1139,7 @@ typedef int		(*LPRecvfrom)(struct IPerlSock*, SOCKET, char*, int,
 typedef int		(*LPSelect)(struct IPerlSock*, int, char*, char*,
 			    char*, const struct timeval*);
 typedef int		(*LPSend)(struct IPerlSock*, SOCKET, const char*, int,
-			    int); 
+			    int);
 typedef int		(*LPSendto)(struct IPerlSock*, SOCKET, const char*,
 			    int, int, const struct sockaddr*, int);
 typedef void		(*LPSethostent)(struct IPerlSock*, int);
@@ -1174,98 +1213,98 @@ struct IPerlSockInfo
 };
 
 #define PerlSock_htonl(x)						\
-	(*PL_piSock->pHtonl)(PL_piSock, x)
+	(*PL_Sock->pHtonl)(PL_Sock, x)
 #define PerlSock_htons(x)						\
-	(*PL_piSock->pHtons)(PL_piSock, x)
+	(*PL_Sock->pHtons)(PL_Sock, x)
 #define PerlSock_ntohl(x)						\
-	(*PL_piSock->pNtohl)(PL_piSock, x)
+	(*PL_Sock->pNtohl)(PL_Sock, x)
 #define PerlSock_ntohs(x)						\
-	(*PL_piSock->pNtohs)(PL_piSock, x)
+	(*PL_Sock->pNtohs)(PL_Sock, x)
 #define PerlSock_accept(s, a, l)					\
-	(*PL_piSock->pAccept)(PL_piSock, s, a, l)
+	(*PL_Sock->pAccept)(PL_Sock, s, a, l)
 #define PerlSock_bind(s, n, l)						\
-	(*PL_piSock->pBind)(PL_piSock, s, n, l)
+	(*PL_Sock->pBind)(PL_Sock, s, n, l)
 #define PerlSock_connect(s, n, l)					\
-	(*PL_piSock->pConnect)(PL_piSock, s, n, l)
+	(*PL_Sock->pConnect)(PL_Sock, s, n, l)
 #define PerlSock_endhostent()						\
-	(*PL_piSock->pEndhostent)(PL_piSock)
+	(*PL_Sock->pEndhostent)(PL_Sock)
 #define PerlSock_endnetent()						\
-	(*PL_piSock->pEndnetent)(PL_piSock)
+	(*PL_Sock->pEndnetent)(PL_Sock)
 #define PerlSock_endprotoent()						\
-	(*PL_piSock->pEndprotoent)(PL_piSock)
+	(*PL_Sock->pEndprotoent)(PL_Sock)
 #define PerlSock_endservent()						\
-	(*PL_piSock->pEndservent)(PL_piSock)
+	(*PL_Sock->pEndservent)(PL_Sock)
 #define PerlSock_gethostbyaddr(a, l, t)					\
-	(*PL_piSock->pGethostbyaddr)(PL_piSock, a, l, t)
+	(*PL_Sock->pGethostbyaddr)(PL_Sock, a, l, t)
 #define PerlSock_gethostbyname(n)					\
-	(*PL_piSock->pGethostbyname)(PL_piSock, n)
+	(*PL_Sock->pGethostbyname)(PL_Sock, n)
 #define PerlSock_gethostent()						\
-	(*PL_piSock->pGethostent)(PL_piSock)
+	(*PL_Sock->pGethostent)(PL_Sock)
 #define PerlSock_gethostname(n, l)					\
-	(*PL_piSock->pGethostname)(PL_piSock, n, l)
+	(*PL_Sock->pGethostname)(PL_Sock, n, l)
 #define PerlSock_getnetbyaddr(n, t)					\
-	(*PL_piSock->pGetnetbyaddr)(PL_piSock, n, t)
+	(*PL_Sock->pGetnetbyaddr)(PL_Sock, n, t)
 #define PerlSock_getnetbyname(c)					\
-	(*PL_piSock->pGetnetbyname)(PL_piSock, c)
+	(*PL_Sock->pGetnetbyname)(PL_Sock, c)
 #define PerlSock_getnetent()						\
-	(*PL_piSock->pGetnetent)(PL_piSock)
+	(*PL_Sock->pGetnetent)(PL_Sock)
 #define PerlSock_getpeername(s, n, l)					\
-	(*PL_piSock->pGetpeername)(PL_piSock, s, n, l)
+	(*PL_Sock->pGetpeername)(PL_Sock, s, n, l)
 #define PerlSock_getprotobyname(n)					\
-	(*PL_piSock->pGetprotobyname)(PL_piSock, n)
+	(*PL_Sock->pGetprotobyname)(PL_Sock, n)
 #define PerlSock_getprotobynumber(n)					\
-	(*PL_piSock->pGetprotobynumber)(PL_piSock, n)
+	(*PL_Sock->pGetprotobynumber)(PL_Sock, n)
 #define PerlSock_getprotoent()						\
-	(*PL_piSock->pGetprotoent)(PL_piSock)
+	(*PL_Sock->pGetprotoent)(PL_Sock)
 #define PerlSock_getservbyname(n, p)					\
-	(*PL_piSock->pGetservbyname)(PL_piSock, n, p)
+	(*PL_Sock->pGetservbyname)(PL_Sock, n, p)
 #define PerlSock_getservbyport(port, p)					\
-	(*PL_piSock->pGetservbyport)(PL_piSock, port, p)
+	(*PL_Sock->pGetservbyport)(PL_Sock, port, p)
 #define PerlSock_getservent()						\
-	(*PL_piSock->pGetservent)(PL_piSock)
+	(*PL_Sock->pGetservent)(PL_Sock)
 #define PerlSock_getsockname(s, n, l)					\
-	(*PL_piSock->pGetsockname)(PL_piSock, s, n, l)
+	(*PL_Sock->pGetsockname)(PL_Sock, s, n, l)
 #define PerlSock_getsockopt(s,l,n,v,i)					\
-	(*PL_piSock->pGetsockopt)(PL_piSock, s, l, n, v, i)
+	(*PL_Sock->pGetsockopt)(PL_Sock, s, l, n, v, i)
 #define PerlSock_inet_addr(c)						\
-	(*PL_piSock->pInetAddr)(PL_piSock, c)
+	(*PL_Sock->pInetAddr)(PL_Sock, c)
 #define PerlSock_inet_ntoa(i)						\
-	(*PL_piSock->pInetNtoa)(PL_piSock, i)
+	(*PL_Sock->pInetNtoa)(PL_Sock, i)
 #define PerlSock_listen(s, b)						\
-	(*PL_piSock->pListen)(PL_piSock, s, b)
+	(*PL_Sock->pListen)(PL_Sock, s, b)
 #define PerlSock_recv(s, b, l, f)					\
-	(*PL_piSock->pRecv)(PL_piSock, s, b, l, f)
+	(*PL_Sock->pRecv)(PL_Sock, s, b, l, f)
 #define PerlSock_recvfrom(s,b,l,f,from,fromlen)				\
-	(*PL_piSock->pRecvfrom)(PL_piSock, s, b, l, f, from, fromlen)
+	(*PL_Sock->pRecvfrom)(PL_Sock, s, b, l, f, from, fromlen)
 #define PerlSock_select(n, r, w, e, t)					\
-	(*PL_piSock->pSelect)(PL_piSock, n, (char*)r, (char*)w, (char*)e, t)
+	(*PL_Sock->pSelect)(PL_Sock, n, (char*)r, (char*)w, (char*)e, t)
 #define PerlSock_send(s, b, l, f)					\
-	(*PL_piSock->pSend)(PL_piSock, s, b, l, f)
+	(*PL_Sock->pSend)(PL_Sock, s, b, l, f)
 #define PerlSock_sendto(s, b, l, f, t, tlen)				\
-	(*PL_piSock->pSendto)(PL_piSock, s, b, l, f, t, tlen)
+	(*PL_Sock->pSendto)(PL_Sock, s, b, l, f, t, tlen)
 #define PerlSock_sethostent(f)						\
-	(*PL_piSock->pSethostent)(PL_piSock, f)
+	(*PL_Sock->pSethostent)(PL_Sock, f)
 #define PerlSock_setnetent(f)						\
-	(*PL_piSock->pSetnetent)(PL_piSock, f)
+	(*PL_Sock->pSetnetent)(PL_Sock, f)
 #define PerlSock_setprotoent(f)						\
-	(*PL_piSock->pSetprotoent)(PL_piSock, f)
+	(*PL_Sock->pSetprotoent)(PL_Sock, f)
 #define PerlSock_setservent(f)						\
-	(*PL_piSock->pSetservent)(PL_piSock, f)
+	(*PL_Sock->pSetservent)(PL_Sock, f)
 #define PerlSock_setsockopt(s, l, n, v, len)				\
-	(*PL_piSock->pSetsockopt)(PL_piSock, s, l, n, v, len)
+	(*PL_Sock->pSetsockopt)(PL_Sock, s, l, n, v, len)
 #define PerlSock_shutdown(s, h)						\
-	(*PL_piSock->pShutdown)(PL_piSock, s, h)
+	(*PL_Sock->pShutdown)(PL_Sock, s, h)
 #define PerlSock_socket(a, t, p)					\
-	(*PL_piSock->pSocket)(PL_piSock, a, t, p)
+	(*PL_Sock->pSocket)(PL_Sock, a, t, p)
 #define PerlSock_socketpair(a, t, p, f)					\
-	(*PL_piSock->pSocketpair)(PL_piSock, a, t, p, f)
+	(*PL_Sock->pSocketpair)(PL_Sock, a, t, p, f)
 
 #ifdef WIN32
 #define	PerlSock_closesocket(s)						\
-	(*PL_piSock->pClosesocket)(PL_piSock, s)
+	(*PL_Sock->pClosesocket)(PL_Sock, s)
 #endif
 
-#else	/* PERL_OBJECT */
+#else	/* PERL_IMPLICIT_SYS */
 
 #define PerlSock_htonl(x)		htonl(x)
 #define PerlSock_htons(x)		htons(x)
@@ -1323,24 +1362,7 @@ struct IPerlSockInfo
 #define PerlSock_closesocket(s)		closesocket(s)
 #endif
 
-#endif	/* PERL_OBJECT */
-
-/* Mention
-
-   HAS_READV
-   HAS_RECVMSG
-   HAS_SENDMSG
-   HAS_WRITEV
-   HAS_STRUCT_MSGHDR
-   HAS_STRUCT_CMSGHDR
-
-   here so that Configure picks them up.  Perl core does not
-   use them but somebody might want to extend Socket:: or IO::
-   someday.
-
-   Jarkko Hietaniemi November 1998
-
-   */
+#endif	/* PERL_IMPLICIT_SYS */
 
 #endif	/* __Inc__IPerl___ */