From db943a12b03f048f4f135c38a96e9ee0aa3c7a48 Mon Sep 17 00:00:00 2001 From: Justin Wind Date: Fri, 4 May 2012 14:45:28 -0700 Subject: [PATCH] minor linux portability for buffered image writes --- Makefile | 4 +++- display.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 70445ff..fdd94d2 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,9 @@ ifeq ($(UNAME),Darwin) CPPFLAGS += -DHAVE_FUNOPEN endif ifeq ($(UNAME),Linux) -CPPFLAGS += -DHAVE_FOPENCOOKIE -D_XOPEN_SOURCE=600 +# linux needs _GNU_SOURCE for fopencookie +# linux needs _XOPEN_SOURCE=600 (provided by _GNU_SOURCE) for getopt and strdup +CPPFLAGS += -DHAVE_FOPENCOOKIE -D_GNU_SOURCE endif diff --git a/display.c b/display.c index b6488a5..9d59b29 100644 --- a/display.c +++ b/display.c @@ -115,7 +115,13 @@ void memstream_cookie_fini_(struct memstream_cookie_ *c) { } static -int memstream_write_fn_(void *c, const char *buf, int size) { +/* of course these can't be the same */ +#ifdef HAVE_FOPENCOOKIE +ssize_t memstream_write_fn_(void *c, const char *buf, size_t size) +#else /* HAVE_FOPENCOOKIE */ +int memstream_write_fn_(void *c, const char *buf, int size) +#endif /* HAVE_FOPENCOOKIE */ +{ struct memstream_cookie_ *cookie = c; while ((size_t)size + cookie->offset > cookie->allocated) { @@ -227,7 +233,7 @@ void display_png_write_(struct dcpu16_display_ *d) { #ifdef HAVE_FOPENCOOKIE /* linux-style memory stream */ - struct cookie_io_functions_t cookie_io_functions = { + cookie_io_functions_t cookie_io_functions = { .read = NULL, .write = memstream_write_fn_, .seek = NULL, -- 2.45.2