diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/content.c | 6 | ||||
| -rw-r--r-- | content/content.h | 8 | ||||
| -rw-r--r-- | content/content_type.h | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/content/content.c b/content/content.c index 9c560326e..337b1276d 100644 --- a/content/content.c +++ b/content/content.c @@ -21,10 +21,10 @@ #include "netsurf/css/css.h" #include "netsurf/render/html.h" #include "netsurf/render/textplain.h" -#ifdef riscos #ifdef WITH_JPEG #include "netsurf/riscos/jpeg.h" #endif +#ifdef riscos #ifdef WITH_PNG #include "netsurf/riscos/png.h" #endif @@ -62,10 +62,12 @@ static const struct mime_entry mime_map[] = { #ifdef WITH_GIF {"image/gif", CONTENT_GIF}, #endif +#endif #ifdef WITH_JPEG {"image/jpeg", CONTENT_JPEG}, {"image/pjpeg", CONTENT_JPEG}, #endif +#ifdef riscos #ifdef WITH_PNG {"image/png", CONTENT_PNG}, #endif @@ -114,11 +116,11 @@ static const struct handler_entry handler_map[] = { 0, 0, 0, 0, 0, 0, 0}, {css_create, 0, css_convert, css_revive, 0, css_destroy, 0, 0, 0, 0}, -#ifdef riscos #ifdef WITH_JPEG {nsjpeg_create, 0, nsjpeg_convert, 0, 0, nsjpeg_destroy, nsjpeg_redraw, 0, 0, 0}, #endif +#ifdef riscos #ifdef WITH_PNG {nspng_create, nspng_process_data, nspng_convert, 0, 0, nspng_destroy, nspng_redraw, 0, 0, 0}, diff --git a/content/content.h b/content/content.h index 48a5c1300..b865e6b4c 100644 --- a/content/content.h +++ b/content/content.h @@ -34,13 +34,13 @@ #include "netsurf/render/box.h" #include "netsurf/render/font.h" #include "netsurf/render/html.h" +#ifdef WITH_JPEG +#include "netsurf/riscos/jpeg.h" +#endif #ifdef riscos #ifdef WITH_GIF #include "netsurf/riscos/gif.h" #endif -#ifdef WITH_JPEG -#include "netsurf/riscos/jpeg.h" -#endif #ifdef WITH_PLUGIN #include "netsurf/riscos/plugin.h" #endif @@ -103,10 +103,10 @@ struct content { union { struct content_html_data html; struct content_css_data css; -#ifdef riscos #ifdef WITH_JPEG struct content_jpeg_data jpeg; #endif +#ifdef riscos #ifdef WITH_PNG struct content_png_data png; #endif diff --git a/content/content_type.h b/content/content_type.h index fbafe9e6b..96fa70575 100644 --- a/content/content_type.h +++ b/content/content_type.h @@ -22,10 +22,10 @@ typedef enum { CONTENT_HTML, CONTENT_TEXTPLAIN, CONTENT_CSS, -#ifdef riscos #ifdef WITH_JPEG CONTENT_JPEG, #endif +#ifdef riscos #ifdef WITH_PNG CONTENT_PNG, #endif |