X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlsfio.h;h=de7e9acc1ff2c86fc2d0173e67e6f36275e6707c;hb=2a88172dfacd85c59631dbbc024c8f5d73ec8a9f;hp=82814e1d993ad7e08d24af053fbb98dcc673bd93;hpb=92479810ad7bcca524d84878cb8fc5387a2d262c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlsfio.h b/perlsfio.h
index 82814e1..de7e9ac 100644
--- a/perlsfio.h
+++ b/perlsfio.h
@@ -3,6 +3,11 @@
 #include <sfio.h>
 #endif
 
+/* sfio 2000 changed _stdopen to _stdfdopen */
+#if SFIO_VERSION >= 20000101L
+#define _stdopen _stdfdopen
+#endif
+
 extern Sfio_t*	_stdopen _ARG_((int, const char*));
 extern int	_stdprintf _ARG_((const char*, ...));
 
@@ -11,9 +16,11 @@ extern int	_stdprintf _ARG_((const char*, ...));
 #define PerlIO_stdout()			sfstdout
 #define PerlIO_stdin()			sfstdin
 
+#define PerlIO_isutf8(f)		0
+
 #define PerlIO_printf			sfprintf
 #define PerlIO_stdoutf			_stdprintf
-#define PerlIO_vprintf(f,fmt,a)		sfvprintf(f,fmt,a)          
+#define PerlIO_vprintf(f,fmt,a)		sfvprintf(f,fmt,a)
 #define PerlIO_read(f,buf,count)	sfread(f,buf,count)
 #define PerlIO_write(f,buf,count)	sfwrite(f,buf,count)
 #define PerlIO_open(path,mode)		sfopen(NULL,path,mode)
@@ -30,7 +37,12 @@ extern int	_stdprintf _ARG_((const char*, ...));
 #define PerlIO_fileno(f)		sffileno(f)
 #define PerlIO_clearerr(f)		sfclrerr(f)
 #define PerlIO_flush(f)			sfsync(f)
+#if 0
+/* This breaks tests */
+#define PerlIO_tell(f)			sfseek(f,0,1|SF_SHARE)
+#else
 #define PerlIO_tell(f)			sftell(f)
+#endif
 #define PerlIO_seek(f,o,w)		sfseek(f,o,w)
 #define PerlIO_rewind(f)		(void) sfseek((f),0L,0)
 #define PerlIO_tmpfile()		sftmp(0)
@@ -44,16 +56,16 @@ extern int	_stdprintf _ARG_((const char*, ...));
 
 /* Now our interface to equivalent of Configure's FILE_xxx macros */
 
-#define PerlIO_has_cntptr(f)		1       
-#define PerlIO_get_ptr(mTHX_ f)		((f)->next)
-#define PerlIO_get_cnt(mTHX_ f)		((f)->endr - (f)->next)
-#define PerlIO_canset_cnt(f)		1      
-#define PerlIO_fast_gets(f)		1        
-#define PerlIO_set_ptrcnt(mTHX_ f,p,c)	((f)->next = (p))          
-#define PerlIO_set_cnt(mTHX_ f,c)		1
-
-#define PerlIO_has_base(f)		1         
-#define PerlIO_get_base(mTHX_ f)		((f)->data)
-#define PerlIO_get_bufsiz(mTHX_ f)		((f)->endr - (f)->data)
+#define PerlIO_has_cntptr(f)		1
+#define PerlIO_get_ptr(f)		((f)->next)
+#define PerlIO_get_cnt(f)		((f)->endr - (f)->next)
+#define PerlIO_canset_cnt(f)		1
+#define PerlIO_fast_gets(f)		1
+#define PerlIO_set_ptrcnt(f,p,c)	STMT_START {(f)->next = (unsigned char *)(p); assert(PerlIO_get_cnt(f) == (c));} STMT_END
+#define PerlIO_set_cnt(f,c)		STMT_START {(f)->next = (f)->endr - (c);} STMT_END
+
+#define PerlIO_has_base(f)		1
+#define PerlIO_get_base(f)		((f)->data)
+#define PerlIO_get_bufsiz(f)		((f)->endr - (f)->data)