Merge branch 'master' into forms

Conflicts:
	fitz/doc_document.c
	fitz/fitz-internal.h
	fitz/fitz.h
	fitz/stm_buffer.c
	pdf/mupdf-internal.h
	pdf/pdf_object.c
	pdf/pdf_xobject.c
	pdf/pdf_xref.c
	win32/mupdf.sln

1 files changed, 4 insertions, 0 deletions

diff --git a/pdf/pdf_js_none.c b/pdf/pdf_js_none.c
index a85103e4..bc8d2ee7 100644
--- a/pdf/pdf_js_none.c
+++ b/pdf/pdf_js_none.c
@@ -13,6 +13,10 @@ void pdf_drop_js(pdf_js *js)
 {
 }
 
+void pdf_js_setup_event(pdf_js *js, pdf_obj *target)
+{
+}
+
 void pdf_js_execute(pdf_js *js, char *code)
 {
 }