summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--content/content.c18
-rw-r--r--riscos/filetype.c4
2 files changed, 13 insertions, 9 deletions
diff --git a/content/content.c b/content/content.c
index 77b68e447..26d13bd80 100644
--- a/content/content.c
+++ b/content/content.c
@@ -69,6 +69,10 @@ static const struct mime_entry mime_map[] = {
#ifdef WITH_GIF
{"image/gif", CONTENT_GIF},
#endif
+#ifdef WITH_MNG
+ {"image/jng", CONTENT_JNG},
+ {"image/mng", CONTENT_MNG},
+#endif
#ifdef WITH_JPEG
{"image/jpeg", CONTENT_JPEG},
{"image/pjpeg", CONTENT_JPEG},
@@ -76,16 +80,12 @@ static const struct mime_entry mime_map[] = {
#ifdef WITH_PNG
{"image/png", CONTENT_PNG},
#endif
+#ifdef WITH_DRAW
+ {"image/x-drawfile", CONTENT_DRAW},
+#endif
#ifdef WITH_MNG
- {"image/jng", CONTENT_JNG},
{"image/x-jng", CONTENT_JNG},
- {"image/mng", CONTENT_MNG},
{"image/x-mng", CONTENT_MNG},
- {"video/mng", CONTENT_MNG},
- {"video/x-mng", CONTENT_MNG},
-#endif
-#ifdef WITH_DRAW
- {"image/x-drawfile", CONTENT_DRAW},
#endif
#ifdef WITH_SPRITE
{"image/x-riscos-sprite", CONTENT_SPRITE},
@@ -93,6 +93,10 @@ static const struct mime_entry mime_map[] = {
{"text/css", CONTENT_CSS},
{"text/html", CONTENT_HTML},
{"text/plain", CONTENT_TEXTPLAIN},
+#ifdef WITH_MNG
+ {"video/mng", CONTENT_MNG},
+ {"video/x-mng", CONTENT_MNG},
+#endif
};
#define MIME_MAP_COUNT (sizeof(mime_map) / sizeof(mime_map[0]))
diff --git a/riscos/filetype.c b/riscos/filetype.c
index 479b3acdc..f0c9fa71d 100644
--- a/riscos/filetype.c
+++ b/riscos/filetype.c
@@ -23,11 +23,11 @@ struct type_entry {
};
static const struct type_entry type_map[] = {
{0x188, "application/x-shockwave-flash"},
+ {0x251, "image/jng"}, /* currently in user space */
+ {0x252, "image/mng"}, /* currently in user space */
{0x695, "image/gif"},
{0xaff, "image/x-drawfile"},
{0xb60, "image/png"},
- {0x251, "image/jng"}, /* currently in user space */
- {0x252, "image/mng"}, /* currently in user space */
{0xc85, "image/jpeg"},
{0xf79, "text/css"},
{0xfaf, "text/html"},