Integrate mainline

p4raw-id: //depot/perlio@13900

1 files changed, 32 insertions, 1 deletions

diff --git a/embed.pl b/embed.pl
index 26758ebfae..e7ca79cc8e 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1277,7 +1277,7 @@ p	|PADOFFSET|find_threadsv|const char *name
 #endif
 p	|OP*	|force_list	|OP* arg
 p	|OP*	|fold_constants	|OP* arg
-Afp	|char*	|form		|const char* pat|...
+Afpd	|char*	|form		|const char* pat|...
 Ap	|char*	|vform		|const char* pat|va_list* args
 Ap	|void	|free_tmps
 p	|OP*	|gen_constant_list|OP* o
@@ -2353,6 +2353,37 @@ Apd	|STRLEN	|sv_utf8_upgrade_flags|SV *sv|I32 flags
 Apd	|char*	|sv_pvn_force_flags|SV* sv|STRLEN* lp|I32 flags
 Apd	|char*	|sv_2pv_flags	|SV* sv|STRLEN* lp|I32 flags
 Ap	|char*	|my_atof2	|const char *s|NV* value
+#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET)
+Ap	|int	|my_socketpair	|int family|int type|int protocol|int fd[2]
+#endif
+
+
+#if defined(USE_PERLIO) && !defined(USE_SFIO)
+Ap	|int	|PerlIO_close		|PerlIO *
+Ap	|int	|PerlIO_fill		|PerlIO *
+Ap	|int	|PerlIO_fileno		|PerlIO *
+Ap	|int	|PerlIO_eof		|PerlIO *
+Ap	|int	|PerlIO_error		|PerlIO *
+Ap	|int	|PerlIO_flush		|PerlIO *
+Ap	|void	|PerlIO_clearerr	|PerlIO *
+Ap	|void	|PerlIO_set_cnt		|PerlIO *|int
+Ap	|void	|PerlIO_set_ptrcnt	|PerlIO *|STDCHAR *|int
+Ap	|void	|PerlIO_setlinebuf	|PerlIO *
+Ap	|SSize_t|PerlIO_read		|PerlIO *|void *|Size_t
+Ap	|SSize_t|PerlIO_write		|PerlIO *|const void *|Size_t
+Ap	|SSize_t|PerlIO_unread		|PerlIO *|const void *|Size_t
+Ap	|Off_t	|PerlIO_tell		|PerlIO *
+Ap	|int	|PerlIO_seek		|PerlIO *|Off_t|int
+
+Ap	|STDCHAR *|PerlIO_get_base	|PerlIO *
+Ap	|STDCHAR *|PerlIO_get_ptr	|PerlIO *
+Ap	|int	  |PerlIO_get_bufsiz	|PerlIO *
+Ap	|int	  |PerlIO_get_cnt	|PerlIO *
+
+Ap	|PerlIO *|PerlIO_stdin
+Ap	|PerlIO *|PerlIO_stdout
+Ap	|PerlIO *|PerlIO_stderr
+#endif /* PERLIO_LAYERS */
 
 
 #if defined(USE_PERLIO) && !defined(USE_SFIO)