From d4bdb0882a1ee2f58f81a5646bd0802fb5589940 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 27 Mar 2009 01:58:55 +0000 Subject: Don't include libmng.h from mng.h, as it causes jconfig.h to be seen, which in turn causes HAVE_STDLIB_H to be defined, which clashes with the definition of hpdf_config.h. Quite why the auto-generated configuration header for either jpeglib or libharu needs to be public, I've no idea. The above change means that the mng_handle field in content_mng_data is a void *. Fixup the couple of places in mng.c where the mng_handle field needs casting back to its real type. Also take the opportunity to make linewrapping and brace position more consistent. svn path=/trunk/netsurf/; revision=6918 --- image/mng.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'image/mng.h') diff --git a/image/mng.h b/image/mng.h index 20a0462b0..1a3c8852d 100644 --- a/image/mng.h +++ b/image/mng.h @@ -27,7 +27,6 @@ #ifdef WITH_MNG #include -#include struct content; @@ -38,7 +37,7 @@ struct content_mng_data { int read_size; bool waiting; bool displayed; - mng_handle handle; + void *handle; }; bool nsmng_create(struct content *c, const char *params[]); -- cgit v1.2.3