X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=iperlsys.h;h=f82d9c57cbe3f9b7694d5958be780dc0f7e095a8;hb=ccc77fa829183a37ab03551e31f1f6ab7455b0b4;hp=59b2f9a35d73f4584e95298b43d841b22744cdde;hpb=70685ca0840f6815bbaa22840c8fc8d5f39582b5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/iperlsys.h b/iperlsys.h
index 59b2f9a..f82d9c5 100644
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -52,7 +52,7 @@
 
 #ifndef Sighandler_t
 #  if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
-typedef Signal_t (*Sighandler_t) (int, ...);
+typedef Signal_t (*Sighandler_t) (int, siginfo_t*, void*);
 #  else
 typedef Signal_t (*Sighandler_t) (int);
 #  endif
@@ -73,10 +73,10 @@ 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 STDCHAR*	(*LPGetBase)(struct IPerlStdIO*, FILE*);
 typedef int		(*LPGetBufsiz)(struct IPerlStdIO*, FILE*);
 typedef int		(*LPGetCnt)(struct IPerlStdIO*, FILE*);
-typedef char*		(*LPGetPtr)(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*);
@@ -94,9 +94,9 @@ typedef int		(*LPSetVBuf)(struct IPerlStdIO*, FILE*, char*, int,
 typedef void		(*LPSetCnt)(struct IPerlStdIO*, FILE*, int);
 
 #ifndef NETWARE
-typedef void		(*LPSetPtr)(struct IPerlStdIO*, FILE*, char*);
+typedef void		(*LPSetPtr)(struct IPerlStdIO*, FILE*, STDCHAR*);
 #elif defined(NETWARE)
-typedef void		(*LPSetPtr)(struct IPerlStdIO*, FILE*, char*, int);
+typedef void		(*LPSetPtr)(struct IPerlStdIO*, FILE*, STDCHAR*, int);
 #endif
 
 typedef void		(*LPSetlinebuf)(struct IPerlStdIO*, FILE*);
@@ -339,7 +339,7 @@ struct IPerlStdIOInfo
 #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) = ((STDCHAR*)(p))
+#define PerlSIO_set_ptr(f,p)		(FILE_ptr(f) = (p))
 #else
 #define PerlSIO_set_ptr(f,p)		PerlIOProc_abort()
 #endif
@@ -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()
@@ -1409,3 +1412,12 @@ struct IPerlSockInfo
 
 #endif	/* __Inc__IPerl___ */
 
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */