X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/0934c9d92d03b9af0e4cebeaa0942ad89e7cc04b..c62c3cd07f97b4f83d6278278d1396aa599ed89e:/iperlsys.h

diff --git a/iperlsys.h b/iperlsys.h
index d7b7643..0bfad3c 100644
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -77,9 +77,9 @@ 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*, FILE*, char*, int);
-typedef int		(*LPPutc)(struct IPerlStdIO*, FILE*, int);
-typedef int		(*LPPuts)(struct IPerlStdIO*, FILE*, const char*);
+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*);
@@ -225,14 +225,14 @@ struct IPerlStdIOInfo
 	(*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_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, fp)						\
-	(*PL_StdIO->pGets)(PL_StdIO, (fp), s, n)
+#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)						\
@@ -311,12 +311,12 @@ struct IPerlStdIOInfo
 #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_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, fp)		fgets(s,n,fp)
+#define PerlSIO_fgets(s, n, f)		fgets(s,n,f)
 #if defined(VMS) && defined(__DECC)
-     /* Unusual definition of ungetc() here to accomodate fast_sv_gets()'
+     /* Unusual definition of ungetc() here to accommodate fast_sv_gets()'
       * belief that it can mix getc/ungetc with reads from stdio buffer */
      int decc$ungetc(int __c, FILE *__stream);
 #    define PerlSIO_ungetc(c,f) ((c) == EOF ? EOF : \
@@ -476,9 +476,12 @@ typedef char*		(*LPENVGetenv_len)(struct IPerlEnv*,
 #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 char*		(*LPEnvLibPath)(struct IPerlEnv*, 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
 
@@ -544,12 +547,12 @@ struct IPerlEnvInfo
 #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_lib_path(str, lenp)				\
+	(*PL_Env->pLibPath)(PL_Env,(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
@@ -570,9 +573,9 @@ struct IPerlEnvInfo
 
 #ifdef WIN32
 #define PerlEnv_os_id()			win32_os_id()
-#define PerlEnv_lib_path(str)		win32_get_privlib(str)
-#define PerlEnv_sitelib_path(str)	win32_get_sitelib(str)
-#define PerlEnv_vendorlib_path(str)	win32_get_vendorlib(str)
+#define PerlEnv_lib_path(str, lenp)	win32_get_privlib(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()