X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=iperlsys.h;h=f36dcd5f32ac4faa4da25a44481d6a56f4d0749e;hb=765e9edb2de192ef033766d867f9bd290e9935e9;hp=0d9f699513480975ded12102c1cbf4afed389f96;hpb=1d7c184104c076988718a01b77c8706aae05b092;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/iperlsys.h b/iperlsys.h
index 0d9f699..f36dcd5 100644
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -344,7 +344,7 @@ struct _PerlIO;
 
 #ifndef PerlIO_stdoutf
 extern int	PerlIO_stdoutf		(const char *,...)
-					__attribute__((format (printf, 1, 2)));
+					__attribute__((__format__ (__printf__, 1, 2)));
 #endif
 #ifndef PerlIO_puts
 extern int	PerlIO_puts		(PerlIO *,const char *);
@@ -405,11 +405,11 @@ extern void	PerlIO_setlinebuf	(PerlIO *);
 #endif
 #ifndef PerlIO_printf
 extern int	PerlIO_printf		(PerlIO *, const char *,...)
-					__attribute__((format (printf, 2, 3)));
+					__attribute__((__format__ (__printf__, 2, 3)));
 #endif
 #ifndef PerlIO_sprintf
 extern int	PerlIO_sprintf		(char *, int, const char *,...)
-					__attribute__((format (printf, 3, 4)));
+					__attribute__((__format__ (__printf__, 3, 4)));
 #endif
 #ifndef PerlIO_vprintf
 extern int	PerlIO_vprintf		(PerlIO *, const char *, va_list);
@@ -595,8 +595,10 @@ typedef char*		(*LPENVGetenv_len)(struct IPerlEnv*,
 #endif
 #ifdef WIN32
 typedef unsigned long	(*LPEnvOsID)(struct IPerlEnv*);
-typedef char*		(*LPEnvLibPath)(struct IPerlEnv*, char*);
-typedef char*		(*LPEnvSiteLibPath)(struct IPerlEnv*, char*);
+typedef char*		(*LPEnvLibPath)(struct IPerlEnv*, const char*);
+typedef char*		(*LPEnvSiteLibPath)(struct IPerlEnv*, const char*);
+typedef char*		(*LPEnvVendorLibPath)(struct IPerlEnv*, const char*);
+typedef void		(*LPEnvGetChildIO)(struct IPerlEnv*, child_IO_table*);
 #endif
 
 struct IPerlEnv
@@ -618,6 +620,8 @@ struct IPerlEnv
     LPEnvOsID		pEnvOsID;
     LPEnvLibPath	pLibPath;
     LPEnvSiteLibPath	pSiteLibPath;
+    LPEnvVendorLibPath	pVendorLibPath;
+    LPEnvGetChildIO	pGetChildIO;
 #endif
 };
 
@@ -663,6 +667,10 @@ struct IPerlEnvInfo
 	(*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
 
 #else	/* PERL_IMPLICIT_SYS */
@@ -686,6 +694,10 @@ struct IPerlEnvInfo
 
 #ifdef WIN32
 #define PerlEnv_os_id()			win32_os_id()
+#define PerlEnv_lib_path(str)		win32_get_privlib(str)
+#define PerlEnv_sitelib_path(str)	win32_get_sitelib(str)
+#define PerlEnv_vendorlib_path(str)	win32_get_vendorlib(str)
+#define PerlEnv_get_child_IO(ptr)	win32_get_child_IO(ptr)
 #endif
 
 #endif	/* PERL_IMPLICIT_SYS */