summaryrefslogtreecommitdiff
path: root/render/box.c
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-06-02 21:06:18 +0000
committerJames Bursa <james@netsurf-browser.org>2004-06-02 21:06:18 +0000
commitef8e27a4586f3e213437ed8caadb6a8ee56a16d9 (patch)
treebb74449fe81c1a34ee0abe5b904547f01c4e2b01 /render/box.c
parent312b748fd7685e5f7b157370d1ba86137e16e3eb (diff)
downloadnetsurf-ef8e27a4586f3e213437ed8caadb6a8ee56a16d9.tar.gz
netsurf-ef8e27a4586f3e213437ed8caadb6a8ee56a16d9.tar.bz2
[project @ 2004-06-02 21:06:18 by bursa]
Remove some #ifdef riscos. svn path=/import/netsurf/; revision=914
Diffstat (limited to 'render/box.c')
-rw-r--r--render/box.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/render/box.c b/render/box.c
index d763ed8a1..fdda43c94 100644
--- a/render/box.c
+++ b/render/box.c
@@ -24,10 +24,10 @@
#include "netsurf/render/html.h"
#ifdef riscos
#include "netsurf/desktop/gui.h"
+#endif
#ifdef WITH_PLUGIN
#include "netsurf/riscos/plugin.h"
#endif
-#endif
#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
@@ -781,9 +781,20 @@ struct box_result box_br(xmlNode *n, struct box_status *status,
}
static const content_type image_types[] = {
- CONTENT_JPEG, CONTENT_GIF,
-#ifdef riscos
- CONTENT_PNG, CONTENT_SPRITE, CONTENT_DRAW,
+#ifdef WITH_JPEG
+ CONTENT_JPEG,
+#endif
+#ifdef WITH_GIF
+ CONTENT_GIF,
+#endif
+#ifdef WITH_PNG
+ CONTENT_PNG,
+#endif
+#ifdef WITH_SPRITE
+ CONTENT_SPRITE,
+#endif
+#ifdef WITH_DRAW
+ CONTENT_DRAW,
#endif
CONTENT_UNKNOWN };