4 files changed, 9 insertions, 9 deletions
diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h
index 60407b88..7193301a 100644
--- a/fitz/fitz-internal.h
+++ b/fitz/fitz-internal.h
@@ -656,7 +656,7 @@ void fz_trim_buffer(fz_context *ctx, fz_buffer *buf);
 */
 void fz_buffer_cat(fz_context *ctx, fz_buffer *buf, fz_buffer *extra);
 
-void fz_write_buffer(fz_context *ctx, fz_buffer *buf, unsigned char *data, int len);
+void fz_write_buffer(fz_context *ctx, fz_buffer *buf, const void *data, int len);
 
 void fz_write_buffer_byte(fz_context *ctx, fz_buffer *buf, int val);
 
@@ -1454,8 +1454,8 @@ int fz_is_rect_gel(fz_gel *gel);
 void fz_scan_convert(fz_gel *gel, int eofill, const fz_irect *clip, fz_pixmap *pix, unsigned char *colorbv);
 
 void fz_flatten_fill_path(fz_gel *gel, fz_path *path, const fz_matrix *ctm, float flatness);
-void fz_flatten_stroke_path(fz_gel *gel, fz_path *path, fz_stroke_state *stroke, const fz_matrix *ctm, float flatness, float linewidth);
-void fz_flatten_dash_path(fz_gel *gel, fz_path *path, fz_stroke_state *stroke, const fz_matrix *ctm, float flatness, float linewidth);
+void fz_flatten_stroke_path(fz_gel *gel, fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, float flatness, float linewidth);
+void fz_flatten_dash_path(fz_gel *gel, fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, float flatness, float linewidth);
 
 fz_irect *fz_bound_path_accurate(fz_context *ctx, fz_irect *bbox, const fz_irect *scissor, fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, float flatness, float linewidth);
 
diff --git a/fitz/fitz.h b/fitz/fitz.h
index b298877a..853e7482 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -2104,7 +2104,7 @@ struct fz_output_s
 	fz_context *ctx;
 	void *opaque;
 	int (*printf)(fz_output *, const char *, va_list ap);
-	int (*write)(fz_output *, const char *, int n);
+	int (*write)(fz_output *, const void *, int n);
 	void (*close)(fz_output *);
 };
 
@@ -2130,7 +2130,7 @@ int fz_printf(fz_output *, const char *, ...);
 /*
 	fz_write: fwrite equivalent for output streams.
 */
-int fz_write(fz_output *out, const char *data, int len);
+int fz_write(fz_output *out, const void *data, int len);
 
 /*
 	Output a pixmap to an output stream as a png.
diff --git a/fitz/stm_buffer.c b/fitz/stm_buffer.c
index 8b5a40d9..55c057f0 100644
--- a/fitz/stm_buffer.c
+++ b/fitz/stm_buffer.c
@@ -122,7 +122,7 @@ fz_buffer_cat(fz_context *ctx, fz_buffer *buf, fz_buffer *extra)
 	buf->len += extra->len;
 }
 
-void fz_write_buffer(fz_context *ctx, fz_buffer *buf, unsigned char *data, int len)
+void fz_write_buffer(fz_context *ctx, fz_buffer *buf, const void *data, int len)
 {
 	if (buf->len + len > buf->cap)
 		fz_ensure_buffer(ctx, buf, buf->len + len);
diff --git a/fitz/stm_output.c b/fitz/stm_output.c
index 60e898b4..534b3fa1 100644
--- a/fitz/stm_output.c
+++ b/fitz/stm_output.c
@@ -9,7 +9,7 @@ file_printf(fz_output *out, const char *fmt, va_list ap)
 }
 
 static int
-file_write(fz_output *out, const char *buffer, int count)
+file_write(fz_output *out, const void *buffer, int count)
 {
 	FILE *file = (FILE *)out->opaque;
 
@@ -55,7 +55,7 @@ fz_printf(fz_output *out, const char *fmt, ...)
 }
 
 int
-fz_write(fz_output *out, const char *data, int len)
+fz_write(fz_output *out, const void *data, int len)
 {
 	if (!out)
 		return 0;
@@ -71,7 +71,7 @@ buffer_printf(fz_output *out, const char *fmt, va_list list)
 }
 
 static int
-buffer_write(fz_output *out, const char *data, int len)
+buffer_write(fz_output *out, const void *data, int len)
 {
 	fz_buffer *buffer = (fz_buffer *)out->opaque;