diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-27 01:58:55 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-27 01:58:55 +0000 |
| commit | d4bdb0882a1ee2f58f81a5646bd0802fb5589940 (patch) | |
| tree | d204d8ea07695299883b1fd8d10b499400a30fa3 /image/mng.h | |
| parent | a95145d806187edf14cf47dfbb266675e7556c0e (diff) | |
| download | netsurf-d4bdb0882a1ee2f58f81a5646bd0802fb5589940.tar.gz netsurf-d4bdb0882a1ee2f58f81a5646bd0802fb5589940.tar.bz2 | |
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
Diffstat (limited to 'image/mng.h')
| -rw-r--r-- | image/mng.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 <stdbool.h> -#include <libmng.h> 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[]); |