Merge changes to Thread and add makefile fixups to accomodate Thread

[p5sagit/p5-mst-13.2.git] / perlsdio.h

diff --git a/perlsdio.h b/perlsdio.h
index 97add0f..5a15a71 100644 (file)
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -39,12 +39,14 @@
     * VAXCRTL which causes read from a pipe after EOF has been returned
     * once to hang.
     */
-#  define PerlIO_getc(f)               (feof(f) ? EOF : getc(f))
-#  define PerlIO_read(f,buf,count)     (feof(f) ? 0 : fread(buf,1,count,f))
+#  define PerlIO_getc(f) \
+               (feof(f) ? EOF : getc(f))
+#  define PerlIO_read(f,buf,count) \
+               (feof(f) ? 0 : (SSize_t)fread(buf,1,count,f))
 #else
 #  define PerlIO_ungetc(f,c)           ungetc(c,f)
 #  define PerlIO_getc(f)               getc(f)
-#  define PerlIO_read(f,buf,count)     fread(buf,1,count,f)
+#  define PerlIO_read(f,buf,count)     (SSize_t)fread(buf,1,count,f)
 #endif
 #define PerlIO_eof(f)                  feof(f)
 #define PerlIO_getname(f,b)            fgetname(f,b)
@@ -104,7 +106,7 @@
 #define PerlIO_has_cntptr(f)           0
 #define PerlIO_canset_cnt(f)           0
 #define PerlIO_get_cnt(f)              (abort(),0)
-#define PerlIO_get_ptr(f)              (abort(),0)
+#define PerlIO_get_ptr(f)              (abort(),(void *)0)
 #define PerlIO_set_cnt(f,c)            abort()
 #define PerlIO_set_ptrcnt(f,p,c)       abort()
 
@@ -121,7 +123,7 @@
 #define PerlIO_get_bufsiz(f)           FILE_bufsiz(f)       
 #else
 #define PerlIO_has_base(f)             0
-#define PerlIO_get_base(f)             (abort(),0)
+#define PerlIO_get_base(f)             (abort(),(void *)0)
 #define PerlIO_get_bufsiz(f)           (abort(),0)
 #endif
 #else /* PERLIO_IS_STDIO */