conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace fpos_t with long since old versions of clang and gcc seem claim 

that fpos_t and long are not convertible
This commit is contained in:
Yuichi Nishiwaki 2014-01-16 20:13:13 +09:00
parent 31adf248af
commit 8709ada140
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/picrin/port.h
View File

@ -37,7 +37,7 @@ typedef struct {
void *cookie; void *cookie;
int (*read)(void *, char *, int); int (*read)(void *, char *, int);
int (*write)(void *, const char *, int); int (*write)(void *, const char *, int);
fpos_t (*seek)(void *, fpos_t, int); long (*seek)(void *, long, int);
int (*close)(void *); int (*close)(void *);
} vtable; } vtable;
} pic_file; } pic_file;
@ -62,7 +62,7 @@ int pic_setvbuf(pic_file *, char *, int, size_t);
int pic_fflush(pic_file *); int pic_fflush(pic_file *);
int pic_ffill(pic_file *); int pic_ffill(pic_file *);
pic_file *pic_funopen(void *cookie, int (*read)(void *, char *, int), int (*write)(void *, const char *, int), fpos_t (*seek)(void *, fpos_t, int), int (*close)(void *)); pic_file *pic_funopen(void *cookie, int (*read)(void *, char *, int), int (*write)(void *, const char *, int), long (*seek)(void *, long, int), int (*close)(void *));
/* file access */ /* file access */
pic_file *pic_fopen(const char *, const char *); pic_file *pic_fopen(const char *, const char *);

8
src/port.c
View File

@ -95,7 +95,7 @@ pic_file *
pic_funopen(void *cookie, pic_funopen(void *cookie,
int (*read)(void *, char *, int), int (*read)(void *, char *, int),
int (*write)(void *, const char *, int), int (*write)(void *, const char *, int),
fpos_t (*seek)(void *, fpos_t, int), long (*seek)(void *, long, int),
int (*close)(void *)) int (*close)(void *))
{ {
pic_file *file; pic_file *file;
@ -134,10 +134,10 @@ file_write(void *cookie, const char *ptr, int size)
return fwrite(ptr, 1, size, (FILE *)cookie); return fwrite(ptr, 1, size, (FILE *)cookie);
} }
static fpos_t static long
file_seek(void *cookie, fpos_t pos, int whence) file_seek(void *cookie, long pos, int whence)
{ {
return fseek((FILE *)cookie, (long)pos, whence); return fseek((FILE *)cookie, pos, whence);
} }
static int static int