new perldelta

[perl5.git] / iperlsys.h

diff --git a/iperlsys.h b/iperlsys.h
index 081d8b2..40ff8a3 100644 (file)
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -3,14 +3,8 @@
  *
  * This file defines the system level functionality that perl needs.
  *
  *
  * This file defines the system level functionality that perl needs.
  *

- * When using C, this definition is in the form of a set of macros
- * that can be #defined to the system-level function (or a wrapper
- * provided elsewhere).
- *
- * When using C++ with -DPERL_OBJECT, this definition is in the
- * form of a set of virtual base classes which must be subclassed to
- * provide a real implementation.  The Perl Object will use instances
- * of this implementation to use the system-level functionality.
+ * When using C, this definition is in the form of a set of macros that can be
+ * #defined to the system-level function (or a wrapper provided elsewhere).

  *
  * GSAR 21-JUN-98
  */
  *
  * GSAR 21-JUN-98
  */


@@ -19,13 +13,13 @@
 #define __Inc__IPerl___
 
 /*
 #define __Inc__IPerl___
 
 /*

- *     PerlXXX_YYY explained - DickH and DougL @ ActiveState.com
+ *      PerlXXX_YYY explained - DickH and DougL @ ActiveState.com

  *
  * XXX := functional group
  * YYY := stdlib/OS function name
  *
  *
  * XXX := functional group
  * YYY := stdlib/OS function name
  *

- * Continuing with the theme of PerlIO, all OS functionality was
- * encapsulated into one of several interfaces.
+ * Continuing with the theme of PerlIO, all OS functionality was encapsulated
+ * into one of several interfaces.

  *
  * PerlIO - stdio
  * PerlLIO - low level I/O
  *
  * PerlIO - stdio
  * PerlLIO - low level I/O


@@ -55,295 +49,314 @@
 */
 #include "perlio.h"
 
 */
 #include "perlio.h"
 

+
+typedef Signal_t (*Sighandler1_t) (int);
+typedef Signal_t (*Sighandler3_t) (int, Siginfo_t*, void*);
+

 #ifndef Sighandler_t
 #ifndef Sighandler_t

-typedef Signal_t (*Sighandler_t) (int);
+#  ifdef PERL_USE_3ARG_SIGHANDLER
+typedef Sighandler3_t Sighandler_t;
+#  else
+typedef Sighandler1_t Sighandler_t;
+#  endif

 #endif
 
 #if defined(PERL_IMPLICIT_SYS)
 
 #endif
 
 #if defined(PERL_IMPLICIT_SYS)
 

-/* IPerlStdIO          */
+/* IPerlStdIO           */

 struct IPerlStdIO;
 struct IPerlStdIOInfo;
 struct IPerlStdIO;
 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*, 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*, 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*, FILE*, const char*,
-                           va_list);
-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*);
+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*, 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 STDCHAR*        (*LPGetBase)(struct IPerlStdIO*, FILE*);
+typedef int             (*LPGetBufsiz)(struct IPerlStdIO*, FILE*);
+typedef int             (*LPGetCnt)(struct IPerlStdIO*, FILE*);
+typedef STDCHAR*        (*LPGetPtr)(struct IPerlStdIO*, FILE*);
+typedef char*           (*LPGets)(struct IPerlStdIO*, char*, int, FILE*);
+typedef int             (*LPPutc)(struct IPerlStdIO*, int, FILE*);
+typedef int             (*LPPuts)(struct IPerlStdIO*, const char *, FILE*);
+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*, FILE*, int);
+
+typedef void            (*LPSetPtr)(struct IPerlStdIO*, FILE*, STDCHAR*);
+
+typedef void            (*LPSetlinebuf)(struct IPerlStdIO*, FILE*);
+typedef int             (*LPPrintf)(struct IPerlStdIO*, FILE*, const char*,
+                            ...);
+typedef int             (*LPVprintf)(struct IPerlStdIO*, FILE*, const char*,
+                            va_list);
+typedef Off_t           (*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
 {
 
 struct IPerlStdIO
 {

-    LPStdin            pStdin;
-    LPStdout           pStdout;
-    LPStderr           pStderr;
-    LPOpen             pOpen;
-    LPClose            pClose;
-    LPEof              pEof;
-    LPError            pError;
-    LPClearerr         pClearerr;
-    LPGetc             pGetc;
-    LPGetBase          pGetBase;
-    LPGetBufsiz                pGetBufsiz;
-    LPGetCnt           pGetCnt;
-    LPGetPtr           pGetPtr;
-    LPGets             pGets;
-    LPPutc             pPutc;
-    LPPuts             pPuts;
-    LPFlush            pFlush;
-    LPUngetc           pUngetc;
-    LPFileno           pFileno;
-    LPFdopen           pFdopen;
-    LPReopen           pReopen;
-    LPRead             pRead;
-    LPWrite            pWrite;
-    LPSetBuf           pSetBuf;
-    LPSetVBuf          pSetVBuf;
-    LPSetCnt           pSetCnt;
-    LPSetPtr           pSetPtr;
-    LPSetlinebuf       pSetlinebuf;
-    LPPrintf           pPrintf;
-    LPVprintf          pVprintf;
-    LPTell             pTell;
-    LPSeek             pSeek;
-    LPRewind           pRewind;
-    LPTmpfile          pTmpfile;
-    LPGetpos           pGetpos;
-    LPSetpos           pSetpos;
-    LPInit             pInit;
-    LPInitOSExtras     pInitOSExtras;
-    LPFdupopen         pFdupopen;
+    LPStdin             pStdin;
+    LPStdout            pStdout;
+    LPStderr            pStderr;
+    LPOpen              pOpen;
+    LPClose             pClose;
+    LPEof               pEof;
+    LPError             pError;
+    LPClearerr          pClearerr;
+    LPGetc              pGetc;
+    LPGetBase           pGetBase;
+    LPGetBufsiz         pGetBufsiz;
+    LPGetCnt            pGetCnt;
+    LPGetPtr            pGetPtr;
+    LPGets              pGets;
+    LPPutc              pPutc;
+    LPPuts              pPuts;
+    LPFlush             pFlush;
+    LPUngetc            pUngetc;
+    LPFileno            pFileno;
+    LPFdopen            pFdopen;
+    LPReopen            pReopen;
+    LPRead              pRead;
+    LPWrite             pWrite;
+    LPSetBuf            pSetBuf;
+    LPSetVBuf           pSetVBuf;
+    LPSetCnt            pSetCnt;
+    LPSetPtr            pSetPtr;
+    LPSetlinebuf        pSetlinebuf;
+    LPPrintf            pPrintf;
+    LPVprintf           pVprintf;
+    LPTell              pTell;
+    LPSeek              pSeek;
+    LPRewind            pRewind;
+    LPTmpfile           pTmpfile;
+    LPGetpos            pGetpos;
+    LPSetpos            pSetpos;
+    LPInit              pInit;
+    LPInitOSExtras      pInitOSExtras;
+    LPFdupopen          pFdupopen;

 };
 
 struct IPerlStdIOInfo
 {
 };
 
 struct IPerlStdIOInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlStdIO  perlStdIOList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlStdIO   perlStdIOList;

 };
 
 /* These do not belong here ... NI-S, 14 Nov 2000 */
 
 };
 
 /* These do not belong here ... NI-S, 14 Nov 2000 */
 

-#ifdef USE_STDIO_PTR
-#  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
+#  ifdef USE_STDIO_PTR
+#    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
 #      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
 #    endif

-#  endif
-#else  /* USE_STDIO_PTR */
-#  define PerlSIO_has_cntptr(f)                0
-#  define PerlSIO_canset_cnt(f)                0
-#endif /* USE_STDIO_PTR */
+#  else  /* USE_STDIO_PTR */
+#    define PerlSIO_has_cntptr(f)       0
+#    define PerlSIO_canset_cnt(f)       0
+#  endif /* USE_STDIO_PTR */

 
 

-#ifndef PerlSIO_fast_gets
-#define PerlSIO_fast_gets(f)           0
-#endif
+#  ifndef PerlSIO_fast_gets
+#  define PerlSIO_fast_gets(f)          0
+#  endif

 
 

-#ifdef FILE_base
-#define PerlSIO_has_base(f)            1
-#else
-#define PerlSIO_has_base(f)            0
-#endif
+#  ifdef FILE_base
+#    define PerlSIO_has_base(f)         1
+#  else
+#    define PerlSIO_has_base(f)         0
+#  endif

 
 /* Now take FILE * via function table */
 
 
 /* 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()                                               \
-       (*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
-#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()'
+#  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(c,f)                                            \
+        (*PL_StdIO->pPutc)(PL_StdIO, (c),(f))
+#  define PerlSIO_fputs(s,f)                                            \
+        (*PL_StdIO->pPuts)(PL_StdIO, (s),(f))
+#  define PerlSIO_fflush(f)                                             \
+        (*PL_StdIO->pFlush)(PL_StdIO, (f))
+#  define PerlSIO_fgets(s, n, f)                                        \
+        (*PL_StdIO->pGets)(PL_StdIO, s, n, (f))
+#  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()                                              \
+        (*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)
+#  ifdef __VOS__
+   /* Work around VOS bug posix-979, wrongly setting errno when at end of file. */
+#    define PerlSIO_fclose(f)           (((errno==1025)?errno=0:0),fclose(f))
+#    define PerlSIO_feof(f)                     (((errno==1025)?errno=0:0),feof(f))
+#    define PerlSIO_ferror(f)           (((errno==1025)?errno=0:0),ferror(f))
+#  else
+#    define PerlSIO_fclose(f)           fclose(f)
+#    define PerlSIO_feof(f)                     feof(f)
+#    define PerlSIO_ferror(f)           ferror(f)
+#  endif
+#  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
+#  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(c,f)            fputc(c,f)
+#  define PerlSIO_fputs(s,f)            fputs(s,f)
+#  define PerlSIO_fflush(f)             Fflush(f)
+#  define PerlSIO_fgets(s, n, f)                fgets(s,n,f)
+#  if defined(__VMS)
+     /* Unusual definition of ungetc() here to accommodate fast_sv_gets()'

       * belief that it can mix getc/ungetc with reads from stdio buffer */
       * belief that it can mix getc/ungetc with reads from stdio buffer */

+START_EXTERN_C

      int decc$ungetc(int __c, FILE *__stream);
      int decc$ungetc(int __c, FILE *__stream);

-#    define PerlSIO_ungetc(c,f) ((c) == EOF ? EOF : \
-            ((*(f) && !((*(f))->_flag & _IONBF) && \
-            ((*(f))->_ptr > (*(f))->_base)) ? \
+END_EXTERN_C
+#      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)))
             ((*(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 */
+#  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                        fprintf
+#  define PerlSIO_stdoutf                       printf
+#  define PerlSIO_vprintf(f,fmt,a)      vfprintf(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
 
 /*
  *   Interface for directory functions


@@ -351,92 +364,92 @@ struct IPerlStdIOInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
 
 #if defined(PERL_IMPLICIT_SYS)
 

-/* IPerlDir            */
+/* IPerlDir             */

 struct IPerlDir;
 struct IPerlDirInfo;
 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*);
-typedef int            (*LPDirClose)(struct IPerlDir*, DIR*);
-typedef DIR*           (*LPDirOpen)(struct IPerlDir*, char*);
-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
+typedef int             (*LPMakedir)(struct IPerlDir*, const char*, int);
+typedef int             (*LPChdir)(struct IPerlDir*, const char*);
+typedef int             (*LPRmdir)(struct IPerlDir*, const char*);
+typedef int             (*LPDirClose)(struct IPerlDir*, DIR*);
+typedef DIR*            (*LPDirOpen)(struct IPerlDir*, const char*);
+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
 {
 
 struct IPerlDir
 {

-    LPMakedir          pMakedir;
-    LPChdir            pChdir;
-    LPRmdir            pRmdir;
-    LPDirClose         pClose;
-    LPDirOpen          pOpen;
-    LPDirRead          pRead;
-    LPDirRewind                pRewind;
-    LPDirSeek          pSeek;
-    LPDirTell          pTell;
-#ifdef WIN32
-    LPDirMapPathA      pMapPathA;
-    LPDirMapPathW      pMapPathW;
-#endif
+    LPMakedir           pMakedir;
+    LPChdir             pChdir;
+    LPRmdir             pRmdir;
+    LPDirClose          pClose;
+    LPDirOpen           pOpen;
+    LPDirRead           pRead;
+    LPDirRewind         pRewind;
+    LPDirSeek           pSeek;
+    LPDirTell           pTell;
+#  ifdef WIN32
+    LPDirMapPathA       pMapPathA;
+    LPDirMapPathW       pMapPathW;
+#  endif

 };
 
 struct IPerlDirInfo
 {
 };
 
 struct IPerlDirInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlDir    perlDirList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlDir     perlDirList;

 };
 
 };
 

-#define PerlDir_mkdir(name, mode)                              \
-       (*PL_Dir->pMakedir)(PL_Dir, (name), (mode))
-#define PerlDir_chdir(name)                                    \
-       (*PL_Dir->pChdir)(PL_Dir, (name))
-#define PerlDir_rmdir(name)                                    \
-       (*PL_Dir->pRmdir)(PL_Dir, (name))
-#define PerlDir_close(dir)                                     \
-       (*PL_Dir->pClose)(PL_Dir, (dir))
-#define PerlDir_open(name)                                     \
-       (*PL_Dir->pOpen)(PL_Dir, (name))
-#define PerlDir_read(dir)                                      \
-       (*PL_Dir->pRead)(PL_Dir, (dir))
-#define PerlDir_rewind(dir)                                    \
-       (*PL_Dir->pRewind)(PL_Dir, (dir))
-#define PerlDir_seek(dir, loc)                                 \
-       (*PL_Dir->pSeek)(PL_Dir, (dir), (loc))
-#define PerlDir_tell(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
+#  define PerlDir_mkdir(name, mode)                             \
+        (*PL_Dir->pMakedir)(PL_Dir, (name), (mode))
+#  define PerlDir_chdir(name)                                   \
+        (*PL_Dir->pChdir)(PL_Dir, (name))
+#  define PerlDir_rmdir(name)                                   \
+        (*PL_Dir->pRmdir)(PL_Dir, (name))
+#  define PerlDir_close(dir)                                    \
+        (*PL_Dir->pClose)(PL_Dir, (dir))
+#  define PerlDir_open(name)                                    \
+        (*PL_Dir->pOpen)(PL_Dir, (name))
+#  define PerlDir_read(dir)                                     \
+        (*PL_Dir->pRead)(PL_Dir, (dir))
+#  define PerlDir_rewind(dir)                                   \
+        (*PL_Dir->pRewind)(PL_Dir, (dir))
+#  define PerlDir_seek(dir, loc)                                \
+        (*PL_Dir->pSeek)(PL_Dir, (dir), (loc))
+#  define PerlDir_tell(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_IMPLICIT_SYS */
+#  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(name)          chdir((name))
-#endif
-#define PerlDir_rmdir(name)            rmdir((name))
-#define PerlDir_close(dir)             closedir((dir))
-#define PerlDir_open(name)             opendir((name))
-#define PerlDir_read(dir)              readdir((dir))
-#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
+#  define PerlDir_mkdir(name, mode)     Mkdir((name), (mode))
+#  ifdef VMS
+#    define PerlDir_chdir(n)            Chdir((n))
+#  else
+#    define PerlDir_chdir(name)         chdir((name))
+#  endif
+#  define PerlDir_rmdir(name)           rmdir((name))
+#  define PerlDir_close(dir)            closedir((dir))
+#  define PerlDir_open(name)            opendir((name))
+#  define PerlDir_read(dir)             readdir((dir))
+#  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_IMPLICIT_SYS */
+#endif  /* PERL_IMPLICIT_SYS */

 
 /*
     Interface for perl environment functions
 
 /*
     Interface for perl environment functions


@@ -444,132 +457,144 @@ struct IPerlDirInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
 
 #if defined(PERL_IMPLICIT_SYS)
 

-/* IPerlEnv            */
+/* IPerlEnv             */

 struct IPerlEnv;
 struct IPerlEnvInfo;
 struct IPerlEnv;
 struct IPerlEnvInfo;

-typedef char*          (*LPEnvGetenv)(struct IPerlEnv*, const char*);
-typedef int            (*LPEnvPutenv)(struct IPerlEnv*, const char*);
-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 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*,
-                                   const char *varname, unsigned long *len);
-#endif
-#ifdef WIN32
-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
+typedef char*           (*LPEnvGetenv)(struct IPerlEnv*, const char*);
+typedef int             (*LPEnvPutenv)(struct IPerlEnv*, const char*);
+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 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*,
+                                    const char *varname, unsigned long *len);
+#  endif
+#  ifdef WIN32
+typedef unsigned long   (*LPEnvOsID)(struct IPerlEnv*);
+typedef char*           (*LPEnvLibPath)(struct IPerlEnv*, WIN32_NO_REGISTRY_M_(const char*)
+                                        STRLEN *const len);
+typedef char*           (*LPEnvSiteLibPath)(struct IPerlEnv*, const char*,
+                                            STRLEN *const len);
+typedef char*           (*LPEnvVendorLibPath)(struct IPerlEnv*, const char*,
+                                              STRLEN *const len);
+typedef void            (*LPEnvGetChildIO)(struct IPerlEnv*, child_IO_table*);
+#  endif

 
 struct IPerlEnv
 {
 
 struct IPerlEnv
 {

-    LPEnvGetenv                pGetenv;
-    LPEnvPutenv                pPutenv;
-    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;
-#endif
-#ifdef WIN32
-    LPEnvOsID          pEnvOsID;
-    LPEnvLibPath       pLibPath;
-    LPEnvSiteLibPath   pSiteLibPath;
-    LPEnvVendorLibPath pVendorLibPath;
-    LPEnvGetChildIO    pGetChildIO;
-#endif
+    LPEnvGetenv         pGetenv;
+    LPEnvPutenv         pPutenv;
+    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;
+#  endif
+#  ifdef WIN32
+    LPEnvOsID           pEnvOsID;
+    LPEnvLibPath        pLibPath;
+    LPEnvSiteLibPath    pSiteLibPath;
+    LPEnvVendorLibPath  pVendorLibPath;
+    LPEnvGetChildIO     pGetChildIO;
+#  endif

 };
 
 struct IPerlEnvInfo
 {
 };
 
 struct IPerlEnvInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlEnv    perlEnvList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlEnv     perlEnvList;

 };
 
 };
 

-#define PerlEnv_putenv(str)                                    \
-       (*PL_Env->pPutenv)(PL_Env,(str))
-#define PerlEnv_getenv(str)                                    \
-       (*PL_Env->pGetenv)(PL_Env,(str))
-#define PerlEnv_getenv_len(str,l)                              \
-       (*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_Env->pENVGetenv)(PL_Env,(str))
-#  define PerlEnv_ENVgetenv_len(str,l)                         \
-       (*PL_Env->pENVGetenv_len)(PL_Env,(str), (l))
-#else
-#  define PerlEnv_ENVgetenv(str)                               \
-       PerlEnv_getenv((str))
-#  define PerlEnv_ENVgetenv_len(str,l)                         \
-       PerlEnv_getenv_len((str),(l))
-#endif
-#define PerlEnv_uname(name)                                    \
-       (*PL_Env->pEnvUname)(PL_Env,(name))
-#ifdef WIN32
-#define PerlEnv_os_id()                                                \
-       (*PL_Env->pEnvOsID)(PL_Env)
-#define PerlEnv_lib_path(str)                                  \
-       (*PL_Env->pLibPath)(PL_Env,(str))
-#define PerlEnv_sitelib_path(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
+#  define PerlEnv_putenv(str)                                   \
+        (*PL_Env->pPutenv)(PL_Env,(str))
+#  define PerlEnv_getenv(str)                                   \
+        (*PL_Env->pGetenv)(PL_Env,(str))
+#  define PerlEnv_getenv_len(str,l)                             \
+        (*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_Env->pENVGetenv)(PL_Env,(str))
+#    define PerlEnv_ENVgetenv_len(str,l)                        \
+        (*PL_Env->pENVGetenv_len)(PL_Env,(str), (l))
+#  else
+#    define PerlEnv_ENVgetenv(str)                              \
+        PerlEnv_getenv((str))
+#    define PerlEnv_ENVgetenv_len(str,l)                        \
+        PerlEnv_getenv_len((str),(l))
+#  endif
+#  define PerlEnv_uname(name)                                   \
+        (*PL_Env->pEnvUname)(PL_Env,(name))
+#  ifdef WIN32
+#    define PerlEnv_os_id()                                     \
+        (*PL_Env->pEnvOsID)(PL_Env)
+#    define PerlEnv_lib_path(str, lenp)                         \
+        (*PL_Env->pLibPath)(PL_Env,WIN32_NO_REGISTRY_M_(str)(lenp))
+#    define PerlEnv_sitelib_path(str, lenp)                     \
+        (*PL_Env->pSiteLibPath)(PL_Env,(str),(lenp))
+#    define PerlEnv_vendorlib_path(str, lenp)                   \
+        (*PL_Env->pVendorLibPath)(PL_Env,(str),(lenp))
+#    define PerlEnv_get_child_IO(ptr)                           \
+        (*PL_Env->pGetChildIO)(PL_Env, ptr)
+#  endif

 
 

-#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))
-#else
-#  define PerlEnv_ENVgetenv(str)       PerlEnv_getenv((str))
-#  define PerlEnv_ENVgetenv_len(str,l) PerlEnv_getenv_len((str), (l))
-#endif
-#define PerlEnv_uname(name)            uname((name))
-
-#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
+#else   /* below is ! PERL_IMPLICIT_SYS */
+#  ifndef USE_ITHREADS  /* Threaded is an inline function in inline.h */
+#    define PerlEnv_putenv(str)         putenv(str)
+#  endif
+#  define PerlEnv_getenv(str)           mortal_getenv(str)
+#  define PerlEnv_getenv_len(str,l)     getenv_len((str), (l))
+#  ifdef HAS_ENVGETENV
+#    define PerlEnv_ENVgetenv(str)      ENVgetenv((str))
+#    define PerlEnv_ENVgetenv_len(str,l)        ENVgetenv_len((str), (l))
+#  else
+#    define PerlEnv_ENVgetenv(str)      PerlEnv_getenv((str))
+#    define PerlEnv_ENVgetenv_len(str,l)        PerlEnv_getenv_len((str), (l))
+#  endif
+#  define PerlEnv_uname(name)           uname((name))
+
+#  ifdef WIN32
+#    define PerlEnv_os_id()                     win32_os_id()
+#    define PerlEnv_lib_path(str, lenp) win32_get_privlib(WIN32_NO_REGISTRY_M_(str) lenp)
+#    define PerlEnv_sitelib_path(str, lenp)     win32_get_sitelib(str, lenp)
+#    define PerlEnv_vendorlib_path(str, lenp)   win32_get_vendorlib(str, lenp)
+#  define PerlEnv_get_child_IO(ptr)     win32_get_child_IO(ptr)
+#  define PerlEnv_clearenv()            win32_clearenv()
+#  define PerlEnv_get_childenv()                win32_get_childenv()
+#  define PerlEnv_free_childenv(e)      win32_free_childenv((e))
+#  define PerlEnv_get_childdir()                win32_get_childdir()
+#  define PerlEnv_free_childdir(d)      win32_free_childdir((d))
+#  else
+#    define PerlEnv_clearenv(str)               (ENV_LOCK, (clearenv(str)   \
+                                                    ? (ENV_UNLOCK, 1)       \
+                                                    : (ENV_UNLOCK, 0)))
+#    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))
+#  endif

 
 

-#endif /* PERL_IMPLICIT_SYS */
+#endif  /* PERL_IMPLICIT_SYS */

 
 /*
     Interface for perl low-level IO functions
 
 /*
     Interface for perl low-level IO functions


@@ -577,171 +602,199 @@ struct IPerlEnvInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
 
 #if defined(PERL_IMPLICIT_SYS)
 

-/* IPerlLIO            */
+struct utimbuf; /* prevent gcc warning about the use below */
+
+/* IPerlLIO             */

 struct IPerlLIO;
 struct IPerlLIOInfo;
 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,
-                           gid_t);
-typedef int            (*LPLIOChsize)(struct IPerlLIO*, int, long);
-typedef int            (*LPLIOClose)(struct IPerlLIO*, int);
-typedef int            (*LPLIODup)(struct IPerlLIO*, int);
-typedef int            (*LPLIODup2)(struct IPerlLIO*, int, int);
-typedef int            (*LPLIOFlock)(struct IPerlLIO*, int, int);
-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*);
-typedef char*          (*LPLIOMktemp)(struct IPerlLIO*, char*);
-typedef int            (*LPLIOOpen)(struct IPerlLIO*, const char*, int);       
-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*);
-typedef int            (*LPLIOUmask)(struct IPerlLIO*, int);
-typedef int            (*LPLIOUnlink)(struct IPerlLIO*, const char*);
-typedef int            (*LPLIOUtime)(struct IPerlLIO*, char*, struct utimbuf*);
-typedef int            (*LPLIOWrite)(struct IPerlLIO*, int, const void*,
-                           unsigned int);
+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, Off_t);
+typedef int             (*LPLIOClose)(struct IPerlLIO*, int);
+typedef int             (*LPLIODup)(struct IPerlLIO*, int);
+typedef int             (*LPLIODup2)(struct IPerlLIO*, int, int);
+typedef int             (*LPLIOFlock)(struct IPerlLIO*, int, int);
+typedef int             (*LPLIOFileStat)(struct IPerlLIO*, int, Stat_t*);
+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 Off_t           (*LPLIOLseek)(struct IPerlLIO*, int, Off_t, int);
+typedef int             (*LPLIOLstat)(struct IPerlLIO*, const char*,
+                            Stat_t*);
+typedef char*           (*LPLIOMktemp)(struct IPerlLIO*, char*);
+typedef int             (*LPLIOOpen)(struct IPerlLIO*, const char*, int);       
+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*);
+typedef int             (*LPLIOSetmode)(struct IPerlLIO*, int, int);
+typedef int             (*LPLIONameStat)(struct IPerlLIO*, const char*,
+                            Stat_t*);
+typedef char*           (*LPLIOTmpnam)(struct IPerlLIO*, char*);
+typedef int             (*LPLIOUmask)(struct IPerlLIO*, int);
+typedef int             (*LPLIOUnlink)(struct IPerlLIO*, const char*);
+typedef int             (*LPLIOUtime)(struct IPerlLIO*, const char*, struct utimbuf*);
+typedef int             (*LPLIOWrite)(struct IPerlLIO*, int, const void*,
+                            unsigned int);
+typedef int             (*LPLIOSymLink)(struct IPerlLIO*, const char*,
+                                     const char *);
+typedef int             (*LPLIOReadLink)(struct IPerlLIO*, const char*,
+                                         char *, size_t);

 
 struct IPerlLIO
 {
 
 struct IPerlLIO
 {

-    LPLIOAccess                pAccess;
-    LPLIOChmod         pChmod;
-    LPLIOChown         pChown;
-    LPLIOChsize                pChsize;
-    LPLIOClose         pClose;
-    LPLIODup           pDup;
-    LPLIODup2          pDup2;
-    LPLIOFlock         pFlock;
-    LPLIOFileStat      pFileStat;
-    LPLIOIOCtl         pIOCtl;
-    LPLIOIsatty                pIsatty;
-    LPLIOLink          pLink;
-    LPLIOLseek         pLseek;
-    LPLIOLstat         pLstat;
-    LPLIOMktemp                pMktemp;
-    LPLIOOpen          pOpen;
-    LPLIOOpen3         pOpen3;
-    LPLIORead          pRead;
-    LPLIORename                pRename;
-    LPLIOSetmode       pSetmode;
-    LPLIONameStat      pNameStat;
-    LPLIOTmpnam                pTmpnam;
-    LPLIOUmask         pUmask;
-    LPLIOUnlink                pUnlink;
-    LPLIOUtime         pUtime;
-    LPLIOWrite         pWrite;
+    LPLIOAccess         pAccess;
+    LPLIOChmod          pChmod;
+    LPLIOChown          pChown;
+    LPLIOChsize         pChsize;
+    LPLIOClose          pClose;
+    LPLIODup            pDup;
+    LPLIODup2           pDup2;
+    LPLIOFlock          pFlock;
+    LPLIOFileStat       pFileStat;
+    LPLIOIOCtl          pIOCtl;
+    LPLIOIsatty         pIsatty;
+    LPLIOLink           pLink;
+    LPLIOLseek          pLseek;
+    LPLIOLstat          pLstat;
+    LPLIOMktemp         pMktemp;
+    LPLIOOpen           pOpen;
+    LPLIOOpen3          pOpen3;
+    LPLIORead           pRead;
+    LPLIORename         pRename;
+    LPLIOSetmode        pSetmode;
+    LPLIONameStat       pNameStat;
+    LPLIOTmpnam         pTmpnam;
+    LPLIOUmask          pUmask;
+    LPLIOUnlink         pUnlink;
+    LPLIOUtime          pUtime;
+    LPLIOWrite          pWrite;
+    LPLIOSymLink        pSymLink;
+    LPLIOReadLink       pReadLink;

 };
 
 struct IPerlLIOInfo
 {
 };
 
 struct IPerlLIOInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlLIO    perlLIOList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlLIO     perlLIOList;

 };
 
 };
 

-#define PerlLIO_access(file, mode)                                     \
-       (*PL_LIO->pAccess)(PL_LIO, (file), (mode))
-#define PerlLIO_chmod(file, mode)                                      \
-       (*PL_LIO->pChmod)(PL_LIO, (file), (mode))
-#define PerlLIO_chown(file, owner, group)                              \
-       (*PL_LIO->pChown)(PL_LIO, (file), (owner), (group))
-#define PerlLIO_chsize(fd, size)                                       \
-       (*PL_LIO->pChsize)(PL_LIO, (fd), (size))
-#define PerlLIO_close(fd)                                              \
-       (*PL_LIO->pClose)(PL_LIO, (fd))
-#define PerlLIO_dup(fd)                                                        \
-       (*PL_LIO->pDup)(PL_LIO, (fd))
-#define PerlLIO_dup2(fd1, fd2)                                         \
-       (*PL_LIO->pDup2)(PL_LIO, (fd1), (fd2))
-#define PerlLIO_flock(fd, op)                                          \
-       (*PL_LIO->pFlock)(PL_LIO, (fd), (op))
-#define PerlLIO_fstat(fd, buf)                                         \
-       (*PL_LIO->pFileStat)(PL_LIO, (fd), (buf))
-#define PerlLIO_ioctl(fd, u, buf)                                      \
-       (*PL_LIO->pIOCtl)(PL_LIO, (fd), (u), (buf))
-#define PerlLIO_isatty(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_LIO->pLseek)(PL_LIO, (fd), (offset), (mode))
-#define PerlLIO_lstat(name, buf)                                       \
-       (*PL_LIO->pLstat)(PL_LIO, (name), (buf))
-#define PerlLIO_mktemp(file)                                           \
-       (*PL_LIO->pMktemp)(PL_LIO, (file))
-#define PerlLIO_open(file, flag)                                       \
-       (*PL_LIO->pOpen)(PL_LIO, (file), (flag))
-#define PerlLIO_open3(file, flag, perm)                                        \
-       (*PL_LIO->pOpen3)(PL_LIO, (file), (flag), (perm))
-#define PerlLIO_read(fd, buf, count)                                   \
-       (*PL_LIO->pRead)(PL_LIO, (fd), (buf), (count))
-#define PerlLIO_rename(oname, newname)                                 \
-       (*PL_LIO->pRename)(PL_LIO, (oname), (newname))
-#define PerlLIO_setmode(fd, mode)                                      \
-       (*PL_LIO->pSetmode)(PL_LIO, (fd), (mode))
-#define PerlLIO_stat(name, buf)                                                \
-       (*PL_LIO->pNameStat)(PL_LIO, (name), (buf))
-#define PerlLIO_tmpnam(str)                                            \
-       (*PL_LIO->pTmpnam)(PL_LIO, (str))
-#define PerlLIO_umask(mode)                                            \
-       (*PL_LIO->pUmask)(PL_LIO, (mode))
-#define PerlLIO_unlink(file)                                           \
-       (*PL_LIO->pUnlink)(PL_LIO, (file))
-#define PerlLIO_utime(file, time)                                      \
-       (*PL_LIO->pUtime)(PL_LIO, (file), (time))
-#define PerlLIO_write(fd, buf, count)                                  \
-       (*PL_LIO->pWrite)(PL_LIO, (fd), (buf), (count))
-
-#else  /* PERL_IMPLICIT_SYS */
-
-#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))
-#define PerlLIO_close(fd)              close((fd))
-#define PerlLIO_dup(fd)                        dup((fd))
-#define PerlLIO_dup2(fd1, fd2)         dup2((fd1), (fd2))
-#define PerlLIO_flock(fd, op)          FLOCK((fd), (op))
-#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
-#  define PerlLIO_lstat(name, buf)     lstat((name), (buf))
-#else
-#  define PerlLIO_lstat(name, buf)     PerlLIO_stat((name), (buf))
-#endif
-#define PerlLIO_mktemp(file)           mktemp((file))
-#define PerlLIO_mkstemp(file)          mkstemp((file))
-#define PerlLIO_open(file, flag)       open((file), (flag))
-#define PerlLIO_open3(file, flag, perm)        open((file), (flag), (perm))
-#define PerlLIO_read(fd, buf, count)   read((fd), (buf), (count))
-#define PerlLIO_rename(old, new)       rename((old), (new))
-#define PerlLIO_setmode(fd, mode)      setmode((fd), (mode))
-#define PerlLIO_tmpnam(str)            tmpnam((str))
-#define PerlLIO_umask(mode)            umask((mode))
-#define PerlLIO_unlink(file)           unlink((file))
-#define PerlLIO_utime(file, time)      utime((file), (time))
-#define PerlLIO_write(fd, buf, count)  write((fd), (buf), (count))
-
-#endif /* PERL_IMPLICIT_SYS */
+#  define PerlLIO_access(file, mode)                                    \
+        (*PL_LIO->pAccess)(PL_LIO, (file), (mode))
+#  define PerlLIO_chmod(file, mode)                                     \
+        (*PL_LIO->pChmod)(PL_LIO, (file), (mode))
+#  define PerlLIO_chown(file, owner, group)                             \
+        (*PL_LIO->pChown)(PL_LIO, (file), (owner), (group))
+#  define PerlLIO_chsize(fd, size)                                      \
+        (*PL_LIO->pChsize)(PL_LIO, (fd), (size))
+#  define PerlLIO_close(fd)                                             \
+        (*PL_LIO->pClose)(PL_LIO, (fd))
+#  define PerlLIO_dup(fd)                                               \
+        (*PL_LIO->pDup)(PL_LIO, (fd))
+#  define PerlLIO_dup2(fd1, fd2)                                        \
+        (*PL_LIO->pDup2)(PL_LIO, (fd1), (fd2))
+#  define PerlLIO_flock(fd, op)                                         \
+        (*PL_LIO->pFlock)(PL_LIO, (fd), (op))
+#  define PerlLIO_fstat(fd, buf)                                        \
+        (*PL_LIO->pFileStat)(PL_LIO, (fd), (buf))
+#  define PerlLIO_ioctl(fd, u, buf)                                     \
+        (*PL_LIO->pIOCtl)(PL_LIO, (fd), (u), (buf))
+#  define PerlLIO_isatty(fd)                                            \
+        (*PL_LIO->pIsatty)(PL_LIO, (fd))
+#  define PerlLIO_link(oldname, newname)                                \
+        (*PL_LIO->pLink)(PL_LIO, (oldname), (newname))
+#  define PerlLIO_symlink(oldname, newname)                             \
+        (*PL_LIO->pSymLink)(PL_LIO, (oldname), (newname))
+#  define PerlLIO_readlink(path, buf, bufsiz)                           \
+        (*PL_LIO->pReadLink)(PL_LIO, (path), (buf), (bufsiz))
+#  define PerlLIO_lseek(fd, offset, mode)                               \
+        (*PL_LIO->pLseek)(PL_LIO, (fd), (offset), (mode))
+#  define PerlLIO_lstat(name, buf)                                      \
+        (*PL_LIO->pLstat)(PL_LIO, (name), (buf))
+#  define PerlLIO_mktemp(file)                                          \
+        (*PL_LIO->pMktemp)(PL_LIO, (file))
+#  define PerlLIO_open(file, flag)                                      \
+        (*PL_LIO->pOpen)(PL_LIO, (file), (flag))
+#  define PerlLIO_open3(file, flag, perm)                               \
+        (*PL_LIO->pOpen3)(PL_LIO, (file), (flag), (perm))
+#  define PerlLIO_read(fd, buf, count)                                  \
+        (*PL_LIO->pRead)(PL_LIO, (fd), (buf), (count))
+#  define PerlLIO_rename(oname, newname)                                \
+        (*PL_LIO->pRename)(PL_LIO, (oname), (newname))
+#  define PerlLIO_setmode(fd, mode)                                     \
+        (*PL_LIO->pSetmode)(PL_LIO, (fd), (mode))
+#  define PerlLIO_stat(name, buf)                                       \
+        (*PL_LIO->pNameStat)(PL_LIO, (name), (buf))
+#  define PerlLIO_tmpnam(str)                                           \
+        (*PL_LIO->pTmpnam)(PL_LIO, (str))
+#  define PerlLIO_umask(mode)                                           \
+        (*PL_LIO->pUmask)(PL_LIO, (mode))
+#  define PerlLIO_unlink(file)                                          \
+        (*PL_LIO->pUnlink)(PL_LIO, (file))
+#  define PerlLIO_utime(file, time)                                     \
+        (*PL_LIO->pUtime)(PL_LIO, (file), (time))
+#  define PerlLIO_write(fd, buf, count)                                 \
+        (*PL_LIO->pWrite)(PL_LIO, (fd), (buf), (count))
+
+#else   /* ! PERL_IMPLICIT_SYS */
+
+#  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))
+#  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))
+#  define PerlLIO_flock(fd, op)         FLOCK((fd), (op))
+#  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_symlink(oldname, newname)     symlink((oldname), (newname))
+#  define PerlLIO_readlink(path, buf, bufsiz)   readlink((path), (buf), (bufsiz))
+#  define PerlLIO_lseek(fd, offset, mode)       lseek((fd), (offset), (mode))
+#  define PerlLIO_stat(name, buf)               Stat((name), (buf))
+#  ifdef HAS_LSTAT
+#    define PerlLIO_lstat(name, buf)    lstat((name), (buf))
+#  else
+#    define PerlLIO_lstat(name, buf)    PerlLIO_stat((name), (buf))
+#  endif
+#  define PerlLIO_mktemp(file)          mktemp((file))
+#  if defined(OEMVS)
+#    if (__CHARSET_LIB == 1)
+    int asciiopen(const char* path, int oflag);
+    int asciiopen3(const char* path, int oflag, int perm);
+
+#      define PerlLIO_open(file, flag)          asciiopen((file), (flag))
+#      define PerlLIO_open3(file, flag, perm)   asciiopen3((file), (flag), (perm))
+#    else
+#      define PerlLIO_open(file, flag)          open((file), (flag))
+#      define PerlLIO_open3(file, flag, perm)   open((file), (flag), (perm))
+#    endif
+#  else
+#    define PerlLIO_open(file, flag)            open((file), (flag))
+#    define PerlLIO_open3(file, flag, perm)     open((file), (flag), (perm))
+#  endif
+#  define PerlLIO_read(fd, buf, count)  read((fd), (buf), (count))
+#  define PerlLIO_rename(old, new)      rename((old), (new))
+#  define PerlLIO_setmode(fd, mode)     setmode((fd), (mode))
+#  define PerlLIO_tmpnam(str)           tmpnam((str))
+#  define PerlLIO_umask(mode)           umask((mode))
+#  define PerlLIO_unlink(file)          unlink((file))
+#  define PerlLIO_utime(file, time)     utime((file), (time))
+#  define PerlLIO_write(fd, buf, count) write((fd), (buf), (count))
+
+#endif  /* PERL_IMPLICIT_SYS */

 
 /*
     Interface for perl memory allocation
 
 /*
     Interface for perl memory allocation


@@ -749,114 +802,113 @@ struct IPerlLIOInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
 
 #if defined(PERL_IMPLICIT_SYS)
 

-/* IPerlMem            */
+/* IPerlMem             */

 struct IPerlMem;
 struct IPerlMemInfo;
 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*);
+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
 {
 
 struct IPerlMem
 {

-    LPMemMalloc                pMalloc;
-    LPMemRealloc       pRealloc;
-    LPMemFree          pFree;
-    LPMemCalloc                pCalloc;
-    LPMemGetLock       pGetLock;
-    LPMemFreeLock      pFreeLock;
-    LPMemIsLocked      pIsLocked;
+    LPMemMalloc         pMalloc;
+    LPMemRealloc        pRealloc;
+    LPMemFree           pFree;
+    LPMemCalloc         pCalloc;
+    LPMemGetLock        pGetLock;
+    LPMemFreeLock       pFreeLock;
+    LPMemIsLocked       pIsLocked;

 };
 
 struct IPerlMemInfo
 {
 };
 
 struct IPerlMemInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlMem    perlMemList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlMem     perlMemList;

 };
 
 /* Interpreter specific memory macros */
 };
 
 /* Interpreter specific memory macros */

-#define PerlMem_malloc(size)                               \
-       (*PL_Mem->pMalloc)(PL_Mem, (size))
-#define PerlMem_realloc(buf, size)                         \
-       (*PL_Mem->pRealloc)(PL_Mem, (buf), (size))
-#define PerlMem_free(buf)                                  \
-       (*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)
+#  define PerlMem_malloc(size)                              \
+        (*PL_Mem->pMalloc)(PL_Mem, (size))
+#  define PerlMem_realloc(buf, size)                        \
+        (*PL_Mem->pRealloc)(PL_Mem, (buf), (size))
+#  define PerlMem_free(buf)                                 \
+        (*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 */
 
 /* 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)
-
+#  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 */
 
 /* 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 */
+#  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 */
 
 /* Interpreter specific memory macros */

-#define PerlMem_malloc(size)           malloc((size))
-#define PerlMem_realloc(buf, size)     realloc((buf), (size))
-#define PerlMem_free(buf)              free((buf))
-#define PerlMem_calloc(num, size)      calloc((num), (size))
-#define PerlMem_get_lock()             
-#define PerlMem_free_lock()
-#define PerlMem_is_locked()            0
+#  define PerlMem_malloc(size)          malloc((size))
+#  define PerlMem_realloc(buf, size)    realloc((buf), (size))
+#  define PerlMem_free(buf)             free((buf))
+#  define PerlMem_calloc(num, size)     calloc((num), (size))
+#  define PerlMem_get_lock()            
+#  define PerlMem_free_lock()
+#  define PerlMem_is_locked()           0

 
 /* Shared memory macros */
 
 /* 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
+#  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 */
 
 /* 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
+#  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 */
+#endif  /* PERL_IMPLICIT_SYS */

 
 /*
     Interface for perl process functions
 
 /*
     Interface for perl process functions


@@ -865,225 +917,224 @@ struct IPerlMemInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
 
 #if defined(PERL_IMPLICIT_SYS)
 

-#ifndef jmp_buf
-#include <setjmp.h>
-#endif
+#  ifndef jmp_buf
+#    include <setjmp.h>
+#  endif

 
 

-/* IPerlProc           */
+/* IPerlProc            */

 struct IPerlProc;
 struct IPerlProcInfo;
 struct IPerlProc;
 struct IPerlProcInfo;

-typedef void           (*LPProcAbort)(struct IPerlProc*);
-typedef char*          (*LPProcCrypt)(struct IPerlProc*, const char*,
-                           const char*);
-typedef void           (*LPProcExit)(struct IPerlProc*, int);
-typedef void           (*LPProc_Exit)(struct IPerlProc*, int);
-typedef int            (*LPProcExecl)(struct IPerlProc*, const char*,
-                           const char*, const char*, const char*,
-                           const char*);
-typedef int            (*LPProcExecv)(struct IPerlProc*, const char*,
-                           const char*const*);
-typedef int            (*LPProcExecvp)(struct IPerlProc*, const char*,
-                           const char*const*);
-typedef uid_t          (*LPProcGetuid)(struct IPerlProc*);
-typedef uid_t          (*LPProcGeteuid)(struct IPerlProc*);
-typedef gid_t          (*LPProcGetgid)(struct IPerlProc*);
-typedef gid_t          (*LPProcGetegid)(struct IPerlProc*);
-typedef char*          (*LPProcGetlogin)(struct IPerlProc*);
-typedef int            (*LPProcKill)(struct IPerlProc*, int, int);
-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);
-typedef int            (*LPProcSetgid)(struct IPerlProc*, gid_t);
-typedef int            (*LPProcSleep)(struct IPerlProc*, unsigned int);
-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 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*);
-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 void            (*LPProcAbort)(struct IPerlProc*);
+typedef char*           (*LPProcCrypt)(struct IPerlProc*, const char*,
+                            const char*);
+typedef void            (*LPProcExit)(struct IPerlProc*, int)
+                            __attribute__noreturn__;
+typedef void            (*LPProc_Exit)(struct IPerlProc*, int)
+                            __attribute__noreturn__;
+typedef int             (*LPProcExecl)(struct IPerlProc*, const char*,
+                            const char*, const char*, const char*,
+                            const char*);
+typedef int             (*LPProcExecv)(struct IPerlProc*, const char*,
+                            const char*const*);
+typedef int             (*LPProcExecvp)(struct IPerlProc*, const char*,
+                            const char*const*);
+typedef Uid_t           (*LPProcGetuid)(struct IPerlProc*);
+typedef Uid_t           (*LPProcGeteuid)(struct IPerlProc*);
+typedef Gid_t           (*LPProcGetgid)(struct IPerlProc*);
+typedef Gid_t           (*LPProcGetegid)(struct IPerlProc*);
+typedef char*           (*LPProcGetlogin)(struct IPerlProc*);
+typedef int             (*LPProcKill)(struct IPerlProc*, int, int);
+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);
+typedef int             (*LPProcSetgid)(struct IPerlProc*, gid_t);
+typedef int             (*LPProcSleep)(struct IPerlProc*, unsigned int);
+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 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 int             (*LPProcSpawnvp)(struct IPerlProc*, int, const char*,
+                            const char*const*);
+#  endif
+typedef int             (*LPProcLastHost)(struct IPerlProc*);
+typedef int             (*LPProcGetTimeOfDay)(struct IPerlProc*,
+                                              struct timeval*, void*);

 
 struct IPerlProc
 {
 
 struct IPerlProc
 {

-    LPProcAbort                pAbort;
-    LPProcCrypt                pCrypt;
-    LPProcExit         pExit;
-    LPProc_Exit                p_Exit;
-    LPProcExecl                pExecl;
-    LPProcExecv                pExecv;
-    LPProcExecvp       pExecvp;
-    LPProcGetuid       pGetuid;
-    LPProcGeteuid      pGeteuid;
-    LPProcGetgid       pGetgid;
-    LPProcGetegid      pGetegid;
-    LPProcGetlogin     pGetlogin;
-    LPProcKill         pKill;
-    LPProcKillpg       pKillpg;
-    LPProcPauseProc    pPauseProc;
-    LPProcPopen                pPopen;
-    LPProcPclose       pPclose;
-    LPProcPipe         pPipe;
-    LPProcSetuid       pSetuid;
-    LPProcSetgid       pSetgid;
-    LPProcSleep                pSleep;
-    LPProcTimes                pTimes;
-    LPProcWait         pWait;
-    LPProcWaitpid      pWaitpid;
-    LPProcSignal       pSignal;
-    LPProcFork         pFork;
-    LPProcGetpid       pGetpid;
-#ifdef WIN32
-    LPProcDynaLoader   pDynaLoader;
-    LPProcGetOSError   pGetOSError;
-    LPProcDoCmd                pDoCmd;
-    LPProcSpawn                pSpawn;
-    LPProcSpawnvp      pSpawnvp;
-    LPProcASpawn       pASpawn;
-#endif
+    LPProcAbort         pAbort;
+    LPProcCrypt         pCrypt;
+    LPProcExit          pExit;
+    LPProc_Exit         p_Exit;
+    LPProcExecl         pExecl;
+    LPProcExecv         pExecv;
+    LPProcExecvp        pExecvp;
+    LPProcGetuid        pGetuid;
+    LPProcGeteuid       pGeteuid;
+    LPProcGetgid        pGetgid;
+    LPProcGetegid       pGetegid;
+    LPProcGetlogin      pGetlogin;
+    LPProcKill          pKill;
+    LPProcKillpg        pKillpg;
+    LPProcPauseProc     pPauseProc;
+    LPProcPopen         pPopen;
+    LPProcPclose        pPclose;
+    LPProcPipe          pPipe;
+    LPProcSetuid        pSetuid;
+    LPProcSetgid        pSetgid;
+    LPProcSleep         pSleep;
+    LPProcTimes         pTimes;
+    LPProcWait          pWait;
+    LPProcWaitpid       pWaitpid;
+    LPProcSignal        pSignal;
+    LPProcFork          pFork;
+    LPProcGetpid        pGetpid;
+#  ifdef WIN32
+    LPProcDynaLoader    pDynaLoader;
+    LPProcGetOSError    pGetOSError;
+    LPProcSpawnvp       pSpawnvp;
+#  endif

     LPProcLastHost      pLastHost;
     LPProcLastHost      pLastHost;

-    LPProcPopenList    pPopenList;
+    LPProcPopenList     pPopenList;
+    LPProcGetTimeOfDay  pGetTimeOfDay;

 };
 
 struct IPerlProcInfo
 {
 };
 
 struct IPerlProcInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlProc   perlProcList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlProc    perlProcList;

 };
 
 };
 

-#define PerlProc_abort()                                               \
-       (*PL_Proc->pAbort)(PL_Proc)
-#define PerlProc_crypt(c,s)                                            \
-       (*PL_Proc->pCrypt)(PL_Proc, (c), (s))
-#define PerlProc_exit(s)                                               \
-       (*PL_Proc->pExit)(PL_Proc, (s))
-#define PerlProc__exit(s)                                              \
-       (*PL_Proc->p_Exit)(PL_Proc, (s))
-#define PerlProc_execl(c, w, x, y, z)                                  \
-       (*PL_Proc->pExecl)(PL_Proc, (c), (w), (x), (y), (z))
-#define PerlProc_execv(c, a)                                           \
-       (*PL_Proc->pExecv)(PL_Proc, (c), (a))
-#define PerlProc_execvp(c, a)                                          \
-       (*PL_Proc->pExecvp)(PL_Proc, (c), (a))
-#define PerlProc_getuid()                                              \
-       (*PL_Proc->pGetuid)(PL_Proc)
-#define PerlProc_geteuid()                                             \
-       (*PL_Proc->pGeteuid)(PL_Proc)
-#define PerlProc_getgid()                                              \
-       (*PL_Proc->pGetgid)(PL_Proc)
-#define PerlProc_getegid()                                             \
-       (*PL_Proc->pGetegid)(PL_Proc)
-#define PerlProc_getlogin()                                            \
-       (*PL_Proc->pGetlogin)(PL_Proc)
-#define PerlProc_kill(i, a)                                            \
-       (*PL_Proc->pKill)(PL_Proc, (i), (a))
-#define PerlProc_killpg(i, a)                                          \
-       (*PL_Proc->pKillpg)(PL_Proc, (i), (a))
-#define PerlProc_pause()                                               \
-       (*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)                                              \
-       (*PL_Proc->pPipe)(PL_Proc, (fd))
-#define PerlProc_setuid(u)                                             \
-       (*PL_Proc->pSetuid)(PL_Proc, (u))
-#define PerlProc_setgid(g)                                             \
-       (*PL_Proc->pSetgid)(PL_Proc, (g))
-#define PerlProc_sleep(t)                                              \
-       (*PL_Proc->pSleep)(PL_Proc, (t))
-#define PerlProc_times(t)                                              \
-       (*PL_Proc->pTimes)(PL_Proc, (t))
-#define PerlProc_wait(t)                                               \
-       (*PL_Proc->pWait)(PL_Proc, (t))
-#define PerlProc_waitpid(p,s,f)                                                \
-       (*PL_Proc->pWaitpid)(PL_Proc, (p), (s), (f))
-#define PerlProc_signal(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_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)                                            \
-       (*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)
-
-#else  /* PERL_IMPLICIT_SYS */
-
-#define PerlProc_abort()       abort()
-#define PerlProc_crypt(c,s)    crypt((c), (s))
-#define PerlProc_exit(s)       exit((s))
-#define PerlProc__exit(s)      _exit((s))
-#define PerlProc_execl(c,w,x,y,z)                                      \
-       execl((c), (w), (x), (y), (z))
-#define PerlProc_execv(c, a)   execv((c), (a))
-#define PerlProc_execvp(c, a)  execvp((c), (a))
-#define PerlProc_getuid()      getuid()
-#define PerlProc_geteuid()     geteuid()
-#define PerlProc_getgid()      getgid()
-#define PerlProc_getegid()     getegid()
-#define PerlProc_getlogin()    getlogin()
-#define PerlProc_kill(i, a)    kill((i), (a))
-#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))
-#define PerlProc_setgid(g)     setgid((g))
-#define PerlProc_sleep(t)      sleep((t))
-#define PerlProc_times(t)      times((t))
-#define PerlProc_wait(t)       wait((t))
-#define PerlProc_waitpid(p,s,f)        waitpid((p), (s), (f))
-#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((f))
-#define PerlProc_GetOSError(s,e)                                       \
-       win32_str_os_error((s), (e))
-#endif
-#endif /* PERL_IMPLICIT_SYS */
+#  define PerlProc_abort()                                              \
+        (*PL_Proc->pAbort)(PL_Proc)
+#  define PerlProc_crypt(c,s)                                           \
+        (*PL_Proc->pCrypt)(PL_Proc, (c), (s))
+#  define PerlProc_exit(s)                                              \
+        (*PL_Proc->pExit)(PL_Proc, (s))
+#  define PerlProc__exit(s)                                             \
+        (*PL_Proc->p_Exit)(PL_Proc, (s))
+#  define PerlProc_execl(c, w, x, y, z)                                 \
+        (*PL_Proc->pExecl)(PL_Proc, (c), (w), (x), (y), (z))
+#  define PerlProc_execv(c, a)                                          \
+        (*PL_Proc->pExecv)(PL_Proc, (c), (a))
+#  define PerlProc_execvp(c, a)                                         \
+        (*PL_Proc->pExecvp)(PL_Proc, (c), (a))
+#  define PerlProc_getuid()                                             \
+        (*PL_Proc->pGetuid)(PL_Proc)
+#  define PerlProc_geteuid()                                            \
+        (*PL_Proc->pGeteuid)(PL_Proc)
+#  define PerlProc_getgid()                                             \
+        (*PL_Proc->pGetgid)(PL_Proc)
+#  define PerlProc_getegid()                                            \
+        (*PL_Proc->pGetegid)(PL_Proc)
+#  define PerlProc_getlogin()                                           \
+        (*PL_Proc->pGetlogin)(PL_Proc)
+#  define PerlProc_kill(i, a)                                           \
+        (*PL_Proc->pKill)(PL_Proc, (i), (a))
+#  define PerlProc_killpg(i, a)                                         \
+        (*PL_Proc->pKillpg)(PL_Proc, (i), (a))
+#  define PerlProc_pause()                                              \
+        (*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)                                             \
+        (*PL_Proc->pPipe)(PL_Proc, (fd))
+#  define PerlProc_setuid(u)                                            \
+        (*PL_Proc->pSetuid)(PL_Proc, (u))
+#  define PerlProc_setgid(g)                                            \
+        (*PL_Proc->pSetgid)(PL_Proc, (g))
+#  define PerlProc_sleep(t)                                             \
+        (*PL_Proc->pSleep)(PL_Proc, (t))
+#  define PerlProc_times(t)                                             \
+        (*PL_Proc->pTimes)(PL_Proc, (t))
+#  define PerlProc_wait(t)                                              \
+        (*PL_Proc->pWait)(PL_Proc, (t))
+#  define PerlProc_waitpid(p,s,f)                                       \
+        (*PL_Proc->pWaitpid)(PL_Proc, (p), (s), (f))
+#  define PerlProc_signal(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_Proc->pDynaLoader)(PL_Proc, (f))
+#    define PerlProc_GetOSError(s,e)                                    \
+        (*PL_Proc->pGetOSError)(PL_Proc, (s), (e))
+#    define PerlProc_spawnvp(m, c, a)                                   \
+        (*PL_Proc->pSpawnvp)(PL_Proc, (m), (c), (a))
+#  endif
+#  define PerlProc_lasthost()                                           \
+        (*PL_Proc->pLastHost)(PL_Proc)
+#  define PerlProc_gettimeofday(t,z)                                    \
+        (*PL_Proc->pGetTimeOfDay)(PL_Proc,(t),(z))
+
+#else   /* ! PERL_IMPLICIT_SYS */
+
+#  define PerlProc_abort()      abort()
+#  define PerlProc_crypt(c,s)   crypt((c), (s))
+#  define PerlProc_exit(s)      exit((s))
+#  define PerlProc__exit(s)     _exit((s))
+#  define PerlProc_execl(c,w,x,y,z)                                     \
+        execl((c), (w), (x), (y), (z))
+#  define PerlProc_execv(c, a)  execv((c), (a))
+#  define PerlProc_execvp(c, a) execvp((c), (a))
+#  define PerlProc_getuid()     getuid()
+#  define PerlProc_geteuid()    geteuid()
+#  define PerlProc_getgid()     getgid()
+#  define PerlProc_getegid()    getegid()
+#  define PerlProc_getlogin()   getlogin()
+#  define PerlProc_kill(i, a)   kill((i), (a))
+#  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))
+#  define PerlProc_setgid(g)    setgid((g))
+#  define PerlProc_sleep(t)     sleep((t))
+#  define PerlProc_times(t)     times((t))
+#  define PerlProc_wait(t)      wait((t))
+#  define PerlProc_waitpid(p,s,f) waitpid((p), (s), (f))
+#  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()       my_fork()
+#  define PerlProc_getpid()     getpid()
+#  define PerlProc_gettimeofday(t,z)    gettimeofday((t),(z))
+
+#  ifdef WIN32
+#    define PerlProc_DynaLoad(f)                                        \
+        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
+#endif  /* PERL_IMPLICIT_SYS */

 
 /*
     Interface for perl socket functions
 
 /*
     Interface for perl socket functions


@@ -1091,278 +1142,281 @@ struct IPerlProcInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
 
 #if defined(PERL_IMPLICIT_SYS)
 

-/* PerlSock            */
+/* PerlSock             */

 struct IPerlSock;
 struct IPerlSockInfo;
 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);
-typedef u_short                (*LPNtohs)(struct IPerlSock*, u_short);
-typedef SOCKET         (*LPAccept)(struct IPerlSock*, SOCKET,
-                           struct sockaddr*, int*);
-typedef int            (*LPBind)(struct IPerlSock*, SOCKET,
-                           const struct sockaddr*, int);
-typedef int            (*LPConnect)(struct IPerlSock*, SOCKET,
-                           const struct sockaddr*, int);
-typedef void           (*LPEndhostent)(struct IPerlSock*);
-typedef void           (*LPEndnetent)(struct IPerlSock*);
-typedef void           (*LPEndprotoent)(struct IPerlSock*);
-typedef void           (*LPEndservent)(struct IPerlSock*);
-typedef int            (*LPGethostname)(struct IPerlSock*, char*, int);
-typedef int            (*LPGetpeername)(struct IPerlSock*, SOCKET,
-                           struct sockaddr*, int*);
-typedef struct hostent*        (*LPGethostbyaddr)(struct IPerlSock*, const char*,
-                           int, int);
-typedef struct hostent*        (*LPGethostbyname)(struct IPerlSock*, const char*);
-typedef struct hostent*        (*LPGethostent)(struct IPerlSock*);
-typedef struct netent* (*LPGetnetbyaddr)(struct IPerlSock*, long, int);
-typedef struct netent* (*LPGetnetbyname)(struct IPerlSock*, const char*);
-typedef struct netent* (*LPGetnetent)(struct IPerlSock*);
+typedef u_long          (*LPHtonl)(struct IPerlSock*, u_long);
+typedef u_short         (*LPHtons)(struct IPerlSock*, u_short);
+typedef u_long          (*LPNtohl)(struct IPerlSock*, u_long);
+typedef u_short         (*LPNtohs)(struct IPerlSock*, u_short);
+typedef SOCKET          (*LPAccept)(struct IPerlSock*, SOCKET,
+                            struct sockaddr*, int*);
+typedef int             (*LPBind)(struct IPerlSock*, SOCKET,
+                            const struct sockaddr*, int);
+typedef int             (*LPConnect)(struct IPerlSock*, SOCKET,
+                            const struct sockaddr*, int);
+typedef void            (*LPEndhostent)(struct IPerlSock*);
+typedef void            (*LPEndnetent)(struct IPerlSock*);
+typedef void            (*LPEndprotoent)(struct IPerlSock*);
+typedef void            (*LPEndservent)(struct IPerlSock*);
+typedef int             (*LPGethostname)(struct IPerlSock*, char*, int);
+typedef int             (*LPGetpeername)(struct IPerlSock*, SOCKET,
+                            struct sockaddr*, int*);
+typedef struct hostent* (*LPGethostbyaddr)(struct IPerlSock*, const char*,
+                            int, int);
+typedef struct hostent* (*LPGethostbyname)(struct IPerlSock*, const char*);
+typedef struct hostent* (*LPGethostent)(struct IPerlSock*);
+typedef struct netent*  (*LPGetnetbyaddr)(struct IPerlSock*, long, int);
+typedef struct netent*  (*LPGetnetbyname)(struct IPerlSock*, const char*);
+typedef struct netent*  (*LPGetnetent)(struct IPerlSock*);

 typedef struct protoent*(*LPGetprotobyname)(struct IPerlSock*, const char*);
 typedef struct protoent*(*LPGetprotobynumber)(struct IPerlSock*, int);
 typedef struct protoent*(*LPGetprotoent)(struct IPerlSock*);
 typedef struct protoent*(*LPGetprotobyname)(struct IPerlSock*, const char*);
 typedef struct protoent*(*LPGetprotobynumber)(struct IPerlSock*, int);
 typedef struct protoent*(*LPGetprotoent)(struct IPerlSock*);

-typedef struct servent*        (*LPGetservbyname)(struct IPerlSock*, const char*,
-                           const char*);
-typedef struct servent*        (*LPGetservbyport)(struct IPerlSock*, int,
-                           const char*);
-typedef struct servent*        (*LPGetservent)(struct IPerlSock*);
-typedef int            (*LPGetsockname)(struct IPerlSock*, SOCKET,
-                           struct sockaddr*, int*);
-typedef int            (*LPGetsockopt)(struct IPerlSock*, SOCKET, int, int,
-                           char*, int*);
-typedef unsigned long  (*LPInetAddr)(struct IPerlSock*, const char*);
-typedef char*          (*LPInetNtoa)(struct IPerlSock*, struct in_addr);
-typedef int            (*LPListen)(struct IPerlSock*, SOCKET, int);
-typedef int            (*LPRecv)(struct IPerlSock*, SOCKET, char*, int, int);
-typedef int            (*LPRecvfrom)(struct IPerlSock*, SOCKET, char*, int,
-                           int, struct sockaddr*, int*);
-typedef int            (*LPSelect)(struct IPerlSock*, int, char*, char*,
-                           char*, const struct timeval*);
-typedef int            (*LPSend)(struct IPerlSock*, SOCKET, const char*, int,
-                           int);
-typedef int            (*LPSendto)(struct IPerlSock*, SOCKET, const char*,
-                           int, int, const struct sockaddr*, int);
-typedef void           (*LPSethostent)(struct IPerlSock*, int);
-typedef void           (*LPSetnetent)(struct IPerlSock*, int);
-typedef void           (*LPSetprotoent)(struct IPerlSock*, int);
-typedef void           (*LPSetservent)(struct IPerlSock*, int);
-typedef int            (*LPSetsockopt)(struct IPerlSock*, SOCKET, int, int,
-                           const char*, int);
-typedef int            (*LPShutdown)(struct IPerlSock*, SOCKET, int);
-typedef SOCKET         (*LPSocket)(struct IPerlSock*, int, int, int);
-typedef int            (*LPSocketpair)(struct IPerlSock*, int, int, int,
-                           int*);
-#ifdef WIN32
-typedef int            (*LPClosesocket)(struct IPerlSock*, SOCKET s);
-#endif
+typedef struct servent* (*LPGetservbyname)(struct IPerlSock*, const char*,
+                            const char*);
+typedef struct servent* (*LPGetservbyport)(struct IPerlSock*, int,
+                            const char*);
+typedef struct servent* (*LPGetservent)(struct IPerlSock*);
+typedef int             (*LPGetsockname)(struct IPerlSock*, SOCKET,
+                            struct sockaddr*, int*);
+typedef int             (*LPGetsockopt)(struct IPerlSock*, SOCKET, int, int,
+                            char*, int*);
+typedef unsigned long   (*LPInetAddr)(struct IPerlSock*, const char*);
+typedef char*           (*LPInetNtoa)(struct IPerlSock*, struct in_addr);
+typedef int             (*LPListen)(struct IPerlSock*, SOCKET, int);
+typedef int             (*LPRecv)(struct IPerlSock*, SOCKET, char*, int, int);
+typedef int             (*LPRecvfrom)(struct IPerlSock*, SOCKET, char*, int,
+                            int, struct sockaddr*, int*);
+typedef int             (*LPSelect)(struct IPerlSock*, int, char*, char*,
+                            char*, const struct timeval*);
+typedef int             (*LPSend)(struct IPerlSock*, SOCKET, const char*, int,
+                            int);
+typedef int             (*LPSendto)(struct IPerlSock*, SOCKET, const char*,
+                            int, int, const struct sockaddr*, int);
+typedef void            (*LPSethostent)(struct IPerlSock*, int);
+typedef void            (*LPSetnetent)(struct IPerlSock*, int);
+typedef void            (*LPSetprotoent)(struct IPerlSock*, int);
+typedef void            (*LPSetservent)(struct IPerlSock*, int);
+typedef int             (*LPSetsockopt)(struct IPerlSock*, SOCKET, int, int,
+                            const char*, int);
+typedef int             (*LPShutdown)(struct IPerlSock*, SOCKET, int);
+typedef SOCKET          (*LPSocket)(struct IPerlSock*, int, int, int);
+typedef int             (*LPSocketpair)(struct IPerlSock*, int, int, int,
+                            int*);
+#  ifdef WIN32
+typedef int             (*LPClosesocket)(struct IPerlSock*, SOCKET s);
+#  endif

 
 struct IPerlSock
 {
 
 struct IPerlSock
 {

-    LPHtonl            pHtonl;
-    LPHtons            pHtons;
-    LPNtohl            pNtohl;
-    LPNtohs            pNtohs;
-    LPAccept           pAccept;
-    LPBind             pBind;
-    LPConnect          pConnect;
-    LPEndhostent       pEndhostent;
-    LPEndnetent                pEndnetent;
-    LPEndprotoent      pEndprotoent;
-    LPEndservent       pEndservent;
-    LPGethostname      pGethostname;
-    LPGetpeername      pGetpeername;
-    LPGethostbyaddr    pGethostbyaddr;
-    LPGethostbyname    pGethostbyname;
-    LPGethostent       pGethostent;
-    LPGetnetbyaddr     pGetnetbyaddr;
-    LPGetnetbyname     pGetnetbyname;
-    LPGetnetent                pGetnetent;
-    LPGetprotobyname   pGetprotobyname;
-    LPGetprotobynumber pGetprotobynumber;
-    LPGetprotoent      pGetprotoent;
-    LPGetservbyname    pGetservbyname;
-    LPGetservbyport    pGetservbyport;
-    LPGetservent       pGetservent;
-    LPGetsockname      pGetsockname;
-    LPGetsockopt       pGetsockopt;
-    LPInetAddr         pInetAddr;
-    LPInetNtoa         pInetNtoa;
-    LPListen           pListen;
-    LPRecv             pRecv;
-    LPRecvfrom         pRecvfrom;
-    LPSelect           pSelect;
-    LPSend             pSend;
-    LPSendto           pSendto;
-    LPSethostent       pSethostent;
-    LPSetnetent                pSetnetent;
-    LPSetprotoent      pSetprotoent;
-    LPSetservent       pSetservent;
-    LPSetsockopt       pSetsockopt;
-    LPShutdown         pShutdown;
-    LPSocket           pSocket;
-    LPSocketpair       pSocketpair;
-#ifdef WIN32
-    LPClosesocket      pClosesocket;
-#endif
+    LPHtonl             pHtonl;
+    LPHtons             pHtons;
+    LPNtohl             pNtohl;
+    LPNtohs             pNtohs;
+    LPAccept            pAccept;
+    LPBind              pBind;
+    LPConnect           pConnect;
+    LPEndhostent        pEndhostent;
+    LPEndnetent         pEndnetent;
+    LPEndprotoent       pEndprotoent;
+    LPEndservent        pEndservent;
+    LPGethostname       pGethostname;
+    LPGetpeername       pGetpeername;
+    LPGethostbyaddr     pGethostbyaddr;
+    LPGethostbyname     pGethostbyname;
+    LPGethostent        pGethostent;
+    LPGetnetbyaddr      pGetnetbyaddr;
+    LPGetnetbyname      pGetnetbyname;
+    LPGetnetent         pGetnetent;
+    LPGetprotobyname    pGetprotobyname;
+    LPGetprotobynumber  pGetprotobynumber;
+    LPGetprotoent       pGetprotoent;
+    LPGetservbyname     pGetservbyname;
+    LPGetservbyport     pGetservbyport;
+    LPGetservent        pGetservent;
+    LPGetsockname       pGetsockname;
+    LPGetsockopt        pGetsockopt;
+    LPInetAddr          pInetAddr;
+    LPInetNtoa          pInetNtoa;
+    LPListen            pListen;
+    LPRecv              pRecv;
+    LPRecvfrom          pRecvfrom;
+    LPSelect            pSelect;
+    LPSend              pSend;
+    LPSendto            pSendto;
+    LPSethostent        pSethostent;
+    LPSetnetent         pSetnetent;
+    LPSetprotoent       pSetprotoent;
+    LPSetservent        pSetservent;
+    LPSetsockopt        pSetsockopt;
+    LPShutdown          pShutdown;
+    LPSocket            pSocket;
+    LPSocketpair        pSocketpair;
+#  ifdef WIN32
+    LPClosesocket       pClosesocket;
+#  endif

 };
 
 struct IPerlSockInfo
 {
 };
 
 struct IPerlSockInfo
 {

-    unsigned long      nCount;     /* number of entries expected */
-    struct IPerlSock   perlSockList;
+    unsigned long       nCount;     /* number of entries expected */
+    struct IPerlSock    perlSockList;

 };
 
 };
 

-#define PerlSock_htonl(x)                                              \
-       (*PL_Sock->pHtonl)(PL_Sock, x)
-#define PerlSock_htons(x)                                              \
-       (*PL_Sock->pHtons)(PL_Sock, x)
-#define PerlSock_ntohl(x)                                              \
-       (*PL_Sock->pNtohl)(PL_Sock, x)
-#define PerlSock_ntohs(x)                                              \
-       (*PL_Sock->pNtohs)(PL_Sock, x)
-#define PerlSock_accept(s, a, l)                                       \
-       (*PL_Sock->pAccept)(PL_Sock, s, a, l)
-#define PerlSock_bind(s, n, l)                                         \
-       (*PL_Sock->pBind)(PL_Sock, s, n, l)
-#define PerlSock_connect(s, n, l)                                      \
-       (*PL_Sock->pConnect)(PL_Sock, s, n, l)
-#define PerlSock_endhostent()                                          \
-       (*PL_Sock->pEndhostent)(PL_Sock)
-#define PerlSock_endnetent()                                           \
-       (*PL_Sock->pEndnetent)(PL_Sock)
-#define PerlSock_endprotoent()                                         \
-       (*PL_Sock->pEndprotoent)(PL_Sock)
-#define PerlSock_endservent()                                          \
-       (*PL_Sock->pEndservent)(PL_Sock)
-#define PerlSock_gethostbyaddr(a, l, t)                                        \
-       (*PL_Sock->pGethostbyaddr)(PL_Sock, a, l, t)
-#define PerlSock_gethostbyname(n)                                      \
-       (*PL_Sock->pGethostbyname)(PL_Sock, n)
-#define PerlSock_gethostent()                                          \
-       (*PL_Sock->pGethostent)(PL_Sock)
-#define PerlSock_gethostname(n, l)                                     \
-       (*PL_Sock->pGethostname)(PL_Sock, n, l)
-#define PerlSock_getnetbyaddr(n, t)                                    \
-       (*PL_Sock->pGetnetbyaddr)(PL_Sock, n, t)
-#define PerlSock_getnetbyname(c)                                       \
-       (*PL_Sock->pGetnetbyname)(PL_Sock, c)
-#define PerlSock_getnetent()                                           \
-       (*PL_Sock->pGetnetent)(PL_Sock)
-#define PerlSock_getpeername(s, n, l)                                  \
-       (*PL_Sock->pGetpeername)(PL_Sock, s, n, l)
-#define PerlSock_getprotobyname(n)                                     \
-       (*PL_Sock->pGetprotobyname)(PL_Sock, n)
-#define PerlSock_getprotobynumber(n)                                   \
-       (*PL_Sock->pGetprotobynumber)(PL_Sock, n)
-#define PerlSock_getprotoent()                                         \
-       (*PL_Sock->pGetprotoent)(PL_Sock)
-#define PerlSock_getservbyname(n, p)                                   \
-       (*PL_Sock->pGetservbyname)(PL_Sock, n, p)
-#define PerlSock_getservbyport(port, p)                                        \
-       (*PL_Sock->pGetservbyport)(PL_Sock, port, p)
-#define PerlSock_getservent()                                          \
-       (*PL_Sock->pGetservent)(PL_Sock)
-#define PerlSock_getsockname(s, n, l)                                  \
-       (*PL_Sock->pGetsockname)(PL_Sock, s, n, l)
-#define PerlSock_getsockopt(s,l,n,v,i)                                 \
-       (*PL_Sock->pGetsockopt)(PL_Sock, s, l, n, v, i)
-#define PerlSock_inet_addr(c)                                          \
-       (*PL_Sock->pInetAddr)(PL_Sock, c)
-#define PerlSock_inet_ntoa(i)                                          \
-       (*PL_Sock->pInetNtoa)(PL_Sock, i)
-#define PerlSock_listen(s, b)                                          \
-       (*PL_Sock->pListen)(PL_Sock, s, b)
-#define PerlSock_recv(s, b, l, f)                                      \
-       (*PL_Sock->pRecv)(PL_Sock, s, b, l, f)
-#define PerlSock_recvfrom(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_Sock->pSelect)(PL_Sock, n, (char*)r, (char*)w, (char*)e, t)
-#define PerlSock_send(s, b, l, f)                                      \
-       (*PL_Sock->pSend)(PL_Sock, s, b, l, f)
-#define PerlSock_sendto(s, b, l, f, t, tlen)                           \
-       (*PL_Sock->pSendto)(PL_Sock, s, b, l, f, t, tlen)
-#define PerlSock_sethostent(f)                                         \
-       (*PL_Sock->pSethostent)(PL_Sock, f)
-#define PerlSock_setnetent(f)                                          \
-       (*PL_Sock->pSetnetent)(PL_Sock, f)
-#define PerlSock_setprotoent(f)                                                \
-       (*PL_Sock->pSetprotoent)(PL_Sock, f)
-#define PerlSock_setservent(f)                                         \
-       (*PL_Sock->pSetservent)(PL_Sock, f)
-#define PerlSock_setsockopt(s, l, n, v, len)                           \
-       (*PL_Sock->pSetsockopt)(PL_Sock, s, l, n, v, len)
-#define PerlSock_shutdown(s, h)                                                \
-       (*PL_Sock->pShutdown)(PL_Sock, s, h)
-#define PerlSock_socket(a, t, p)                                       \
-       (*PL_Sock->pSocket)(PL_Sock, a, t, p)
-#define PerlSock_socketpair(a, t, p, f)                                        \
-       (*PL_Sock->pSocketpair)(PL_Sock, a, t, p, f)
-
-#ifdef WIN32
-#define        PerlSock_closesocket(s)                                         \
-       (*PL_Sock->pClosesocket)(PL_Sock, s)
-#endif
+#  define PerlSock_htonl(x)                                             \
+        (*PL_Sock->pHtonl)(PL_Sock, x)
+#  define PerlSock_htons(x)                                             \
+        (*PL_Sock->pHtons)(PL_Sock, x)
+#  define PerlSock_ntohl(x)                                             \
+        (*PL_Sock->pNtohl)(PL_Sock, x)
+#  define PerlSock_ntohs(x)                                             \
+        (*PL_Sock->pNtohs)(PL_Sock, x)
+#  define PerlSock_accept(s, a, l)                                      \
+        (*PL_Sock->pAccept)(PL_Sock, s, a, l)
+#  define PerlSock_bind(s, n, l)                                        \
+        (*PL_Sock->pBind)(PL_Sock, s, n, l)
+#  define PerlSock_connect(s, n, l)                                     \
+        (*PL_Sock->pConnect)(PL_Sock, s, n, l)
+#  define PerlSock_endhostent()                                         \
+        (*PL_Sock->pEndhostent)(PL_Sock)
+#  define PerlSock_endnetent()                                          \
+        (*PL_Sock->pEndnetent)(PL_Sock)
+#  define PerlSock_endprotoent()                                        \
+        (*PL_Sock->pEndprotoent)(PL_Sock)
+#  define PerlSock_endservent()                                         \
+        (*PL_Sock->pEndservent)(PL_Sock)
+#  define PerlSock_gethostbyaddr(a, l, t)                               \
+        (*PL_Sock->pGethostbyaddr)(PL_Sock, a, l, t)
+#  define PerlSock_gethostbyname(n)                                     \
+        (*PL_Sock->pGethostbyname)(PL_Sock, n)
+#  define PerlSock_gethostent()                                         \
+        (*PL_Sock->pGethostent)(PL_Sock)
+#  define PerlSock_gethostname(n, l)                                    \
+        (*PL_Sock->pGethostname)(PL_Sock, n, l)
+#  define PerlSock_getnetbyaddr(n, t)                                   \
+        (*PL_Sock->pGetnetbyaddr)(PL_Sock, n, t)
+#  define PerlSock_getnetbyname(c)                                      \
+        (*PL_Sock->pGetnetbyname)(PL_Sock, c)
+#  define PerlSock_getnetent()                                          \
+        (*PL_Sock->pGetnetent)(PL_Sock)
+#  define PerlSock_getpeername(s, n, l)                                 \
+        (*PL_Sock->pGetpeername)(PL_Sock, s, n, l)
+#  define PerlSock_getprotobyname(n)                                    \
+        (*PL_Sock->pGetprotobyname)(PL_Sock, n)
+#  define PerlSock_getprotobynumber(n)                                  \
+        (*PL_Sock->pGetprotobynumber)(PL_Sock, n)
+#  define PerlSock_getprotoent()                                        \
+        (*PL_Sock->pGetprotoent)(PL_Sock)
+#  define PerlSock_getservbyname(n, p)                                  \
+        (*PL_Sock->pGetservbyname)(PL_Sock, n, p)
+#  define PerlSock_getservbyport(port, p)                               \
+        (*PL_Sock->pGetservbyport)(PL_Sock, port, p)
+#  define PerlSock_getservent()                                         \
+        (*PL_Sock->pGetservent)(PL_Sock)
+#  define PerlSock_getsockname(s, n, l)                                 \
+        (*PL_Sock->pGetsockname)(PL_Sock, s, n, l)
+#  define PerlSock_getsockopt(s,l,n,v,i)                                \
+        (*PL_Sock->pGetsockopt)(PL_Sock, s, l, n, v, i)
+#  define PerlSock_inet_addr(c)                                         \
+        (*PL_Sock->pInetAddr)(PL_Sock, c)
+#  define PerlSock_inet_ntoa(i)                                         \
+        (*PL_Sock->pInetNtoa)(PL_Sock, i)
+#  define PerlSock_listen(s, b)                                         \
+        (*PL_Sock->pListen)(PL_Sock, s, b)
+#  define PerlSock_recv(s, b, l, f)                                     \
+        (*PL_Sock->pRecv)(PL_Sock, s, b, l, f)
+#  define PerlSock_recvfrom(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_Sock->pSelect)(PL_Sock, n, (char*)r, (char*)w, (char*)e, t)
+#  define PerlSock_send(s, b, l, f)                                     \
+        (*PL_Sock->pSend)(PL_Sock, s, b, l, f)
+#  define PerlSock_sendto(s, b, l, f, t, tlen)                          \
+        (*PL_Sock->pSendto)(PL_Sock, s, b, l, f, t, tlen)
+#  define PerlSock_sethostent(f)                                        \
+        (*PL_Sock->pSethostent)(PL_Sock, f)
+#  define PerlSock_setnetent(f)                                         \
+        (*PL_Sock->pSetnetent)(PL_Sock, f)
+#  define PerlSock_setprotoent(f)                                       \
+        (*PL_Sock->pSetprotoent)(PL_Sock, f)
+#  define PerlSock_setservent(f)                                        \
+        (*PL_Sock->pSetservent)(PL_Sock, f)
+#  define PerlSock_setsockopt(s, l, n, v, len)                          \
+        (*PL_Sock->pSetsockopt)(PL_Sock, s, l, n, v, len)
+#  define PerlSock_shutdown(s, h)                                       \
+        (*PL_Sock->pShutdown)(PL_Sock, s, h)
+#  define PerlSock_socket(a, t, p)                                      \
+        (*PL_Sock->pSocket)(PL_Sock, a, t, p)
+#  define PerlSock_socketpair(a, t, p, f)                               \
+        (*PL_Sock->pSocketpair)(PL_Sock, a, t, p, f)
+
+#  ifdef WIN32
+#    define     PerlSock_closesocket(s)                                 \
+        (*PL_Sock->pClosesocket)(PL_Sock, s)
+#  endif

 
 

-#else  /* PERL_IMPLICIT_SYS */
-
-#define PerlSock_htonl(x)              htonl(x)
-#define PerlSock_htons(x)              htons(x)
-#define PerlSock_ntohl(x)              ntohl(x)
-#define PerlSock_ntohs(x)              ntohs(x)
-#define PerlSock_accept(s, a, l)       accept(s, a, l)
-#define PerlSock_bind(s, n, l)         bind(s, n, l)
-#define PerlSock_connect(s, n, l)      connect(s, n, l)
-
-#define PerlSock_gethostbyaddr(a, l, t)        gethostbyaddr(a, l, t)
-#define PerlSock_gethostbyname(n)      gethostbyname(n)
-#define PerlSock_gethostent            gethostent
-#define PerlSock_endhostent            endhostent
-#define PerlSock_gethostname(n, l)     gethostname(n, l)
-
-#define PerlSock_getnetbyaddr(n, t)    getnetbyaddr(n, t)
-#define PerlSock_getnetbyname(n)       getnetbyname(n)
-#define PerlSock_getnetent             getnetent
-#define PerlSock_endnetent             endnetent
-#define PerlSock_getpeername(s, n, l)  getpeername(s, n, l)
-
-#define PerlSock_getprotobyname(n)     getprotobyname(n)
-#define PerlSock_getprotobynumber(n)   getprotobynumber(n)
-#define PerlSock_getprotoent           getprotoent
-#define PerlSock_endprotoent           endprotoent
-
-#define PerlSock_getservbyname(n, p)   getservbyname(n, p)
-#define PerlSock_getservbyport(port, p)        getservbyport(port, p)
-#define PerlSock_getservent            getservent
-#define PerlSock_endservent            endservent
-
-#define PerlSock_getsockname(s, n, l)  getsockname(s, n, l)
-#define PerlSock_getsockopt(s,l,n,v,i) getsockopt(s, l, n, v, i)
-#define PerlSock_inet_addr(c)          inet_addr(c)
-#define PerlSock_inet_ntoa(i)          inet_ntoa(i)
-#define PerlSock_listen(s, b)          listen(s, b)
-#define PerlSock_recv(s, b, l, f)      recv(s, b, l, f)
-#define PerlSock_recvfrom(s, b, l, f, from, fromlen)                   \
-       recvfrom(s, b, l, f, from, fromlen)
-#define PerlSock_select(n, r, w, e, t) select(n, r, w, e, t)
-#define PerlSock_send(s, b, l, f)      send(s, b, l, f)
-#define PerlSock_sendto(s, b, l, f, t, tlen)                           \
-       sendto(s, b, l, f, t, tlen)
-#define PerlSock_sethostent(f)         sethostent(f)
-#define PerlSock_setnetent(f)          setnetent(f)
-#define PerlSock_setprotoent(f)                setprotoent(f)
-#define PerlSock_setservent(f)         setservent(f)
-#define PerlSock_setsockopt(s, l, n, v, len)                           \
-       setsockopt(s, l, n, v, len)
-#define PerlSock_shutdown(s, h)                shutdown(s, h)
-#define PerlSock_socket(a, t, p)       socket(a, t, p)
-#define PerlSock_socketpair(a, t, p, f)        socketpair(a, t, p, f)
-
-#ifdef WIN32
-#define PerlSock_closesocket(s)                closesocket(s)
-#endif
+#else   /* ! PERL_IMPLICIT_SYS below */
+
+#  define PerlSock_htonl(x)             htonl(x)
+#  define PerlSock_htons(x)             htons(x)
+#  define PerlSock_ntohl(x)             ntohl(x)
+#  define PerlSock_ntohs(x)             ntohs(x)
+#  define PerlSock_accept(s, a, l)      accept(s, a, l)
+#  define PerlSock_bind(s, n, l)        bind(s, n, l)
+#  define PerlSock_connect(s, n, l)     connect(s, n, l)
+
+#  define PerlSock_gethostbyaddr(a, l, t) gethostbyaddr(a, l, t)
+#  define PerlSock_gethostbyname(n)     gethostbyname(n)
+#  define PerlSock_gethostent           gethostent
+#  define PerlSock_endhostent           endhostent
+#  define PerlSock_gethostname(n, l)    gethostname(n, l)
+
+#  define PerlSock_getnetbyaddr(n, t)   getnetbyaddr(n, t)
+#  define PerlSock_getnetbyname(n)      getnetbyname(n)
+#  define PerlSock_getnetent            getnetent
+#  define PerlSock_endnetent            endnetent
+#  define PerlSock_getpeername(s, n, l) getpeername(s, n, l)
+
+#  define PerlSock_getprotobyname(n)    getprotobyname(n)
+#  define PerlSock_getprotobynumber(n)  getprotobynumber(n)
+#  define PerlSock_getprotoent          getprotoent
+#  define PerlSock_endprotoent          endprotoent
+
+#  define PerlSock_getservbyname(n, p)  getservbyname(n, p)
+#  define PerlSock_getservbyport(port, p) getservbyport(port, p)
+#  define PerlSock_getservent           getservent
+#  define PerlSock_endservent           endservent
+
+#  define PerlSock_getsockname(s, n, l) getsockname(s, n, l)
+#  define PerlSock_getsockopt(s,l,n,v,i)  getsockopt(s, l, n, v, i)
+#  define PerlSock_inet_addr(c)         inet_addr(c)
+#  define PerlSock_inet_ntoa(i)         inet_ntoa(i)
+#  define PerlSock_listen(s, b)         listen(s, b)
+#  define PerlSock_recv(s, b, l, f)     recv(s, b, l, f)
+#  define PerlSock_recvfrom(s, b, l, f, from, fromlen)                  \
+        recvfrom(s, b, l, f, from, fromlen)
+#  define PerlSock_select(n, r, w, e, t) select(n, r, w, e, t)
+#  define PerlSock_send(s, b, l, f)     send(s, b, l, f)
+#  define PerlSock_sendto(s, b, l, f, t, tlen)                          \
+        sendto(s, b, l, f, t, tlen)
+#  define PerlSock_sethostent(f)        sethostent(f)
+#  define PerlSock_setnetent(f)         setnetent(f)
+#  define PerlSock_setprotoent(f)       setprotoent(f)
+#  define PerlSock_setservent(f)        setservent(f)
+#  define PerlSock_setsockopt(s, l, n, v, len)                          \
+        setsockopt(s, l, n, v, len)
+#  define PerlSock_shutdown(s, h)       shutdown(s, h)
+#  define PerlSock_socket(a, t, p)      socket(a, t, p)
+#  define PerlSock_socketpair(a, t, p, f) socketpair(a, t, p, f)
+
+#  ifdef WIN32
+#    define PerlSock_closesocket(s)     closesocket(s)
+#  endif

 
 

-#endif /* PERL_IMPLICIT_SYS */
+#endif  /* PERL_IMPLICIT_SYS */

 
 

-#endif /* __Inc__IPerl___ */
+#endif  /* __Inc__IPerl___ */

 
 

+/*
+ * ex: set ts=8 sts=4 sw=4 et:
+ */