From d83f683e9681f8ca68701df93cd23d983e104284 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Thu, 6 Jan 2011 23:17:17 +0000
Subject: Sprinkle some #ifdef __amigaos4__ around

svn path=/trunk/netsurf/; revision=11230
---
 amiga/bitmap.c       | 4 +++-
 amiga/context_menu.c | 2 ++
 amiga/download.c     | 2 ++
 amiga/drag.c         | 2 ++
 amiga/font.c         | 2 ++
 amiga/gui.c          | 2 ++
 amiga/gui_options.c  | 2 ++
 amiga/icon.c         | 2 ++
 amiga/menu.c         | 2 ++
 amiga/plotters.c     | 2 ++
 amiga/theme.c        | 2 ++
 amiga/thumbnail.c    | 2 ++
 12 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'amiga')

diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 6ae75e1f7..332b9794f 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -20,14 +20,16 @@
 #include "amiga/bitmap.h"
 #include <proto/exec.h>
 #include <proto/Picasso96API.h>
+#ifdef __amigaos4__
+#include <graphics/blitattr.h>
 #include <graphics/composite.h>
+#endif
 #include "amiga/options.h"
 #include <proto/datatypes.h>
 #include <datatypes/pictureclass.h>
 #include <proto/dos.h>
 #include <proto/intuition.h>
 #include "utils/messages.h"
-#include <graphics/blitattr.h>
 
 /**
  * Create a bitmap.
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 8f93ca3fa..f3d7fe072 100755
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -19,7 +19,9 @@
 #include "amiga/context_menu.h"
 #include "render/box.h"
 #include "render/form.h"
+#ifdef __amigaos4__
 #include <proto/popupmenu.h>
+#endif
 #include <proto/intuition.h>
 #include "amiga/utf8.h"
 #include "utils/utf8.h"
diff --git a/amiga/download.c b/amiga/download.c
index e7f403f12..8837f7c03 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -25,7 +25,9 @@
 #include <proto/intuition.h>
 #include <proto/utility.h>
 #include <proto/icon.h>
+#ifdef __amigaos4__
 #include <proto/application.h>
+#endif
 
 #include <workbench/icon.h>
 
diff --git a/amiga/drag.c b/amiga/drag.c
index 5f2af153c..038efeed5 100644
--- a/amiga/drag.c
+++ b/amiga/drag.c
@@ -26,7 +26,9 @@
 #include <proto/icon.h>
 #include <proto/layers.h>
 
+#ifdef __amigaos4__
 #include <graphics/blitattr.h>
+#endif
 #include <workbench/icon.h>
 
 #include "amiga/download.h"
diff --git a/amiga/font.c b/amiga/font.c
index c62350cee..f8eaa7f1f 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -31,7 +31,9 @@
 #include <diskfont/oterrors.h>
 #include <proto/Picasso96API.h>
 #include <proto/exec.h>
+#ifdef __amigaos4__
 #include <graphics/blitattr.h>
+#endif
 #include "amiga/options.h"
 #include <proto/utility.h>
 #include "utils/utils.h"
diff --git a/amiga/gui.c b/amiga/gui.c
index 9a57cd17d..01172bbe3 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -66,7 +66,9 @@
 #include "amiga/stringview/urlhistory.h"
 
 /* AmigaOS libraries */
+#ifdef __amigaos4__
 #include <proto/application.h>
+#endif
 #include <proto/asl.h>
 #include <proto/datatypes.h>
 #include <proto/dos.h>
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index b5db61736..175b5b5e3 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -21,7 +21,9 @@
 #include <proto/exec.h>
 #include <proto/intuition.h>
 #include <proto/utility.h>
+#ifdef __amigaos4__
 #include <proto/application.h>
+#endif
 #include <libraries/gadtools.h>
 #include <exec/types.h>
 #include <intuition/classusr.h>
diff --git a/amiga/icon.c b/amiga/icon.c
index 5eb3a43f5..14df83721 100644
--- a/amiga/icon.c
+++ b/amiga/icon.c
@@ -31,7 +31,9 @@
 #include <proto/icon.h>
 
 #include <datatypes/pictureclass.h>
+#ifdef __amigaos4__
 #include <graphics/blitattr.h>
+#endif
 #include <workbench/icon.h>
 
 #include "amiga/bitmap.h"
diff --git a/amiga/menu.c b/amiga/menu.c
index 832dfc12f..135d3f20b 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -22,7 +22,9 @@
 #include <proto/asl.h>
 #include <proto/exec.h>
 #include <proto/intuition.h>
+#ifdef __amigaos4__
 #include <dos/anchorpath.h>
+#endif
 #include <libraries/gadtools.h>
 
 #include "amiga/menu.h"
diff --git a/amiga/plotters.c b/amiga/plotters.c
index df4815592..f433ae86d 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -25,8 +25,10 @@
 #include <graphics/gfxmacros.h>
 #include "amiga/utf8.h"
 #include "amiga/options.h"
+#ifdef __amigaos4__
 #include <graphics/blitattr.h>
 #include <graphics/composite.h>
+#endif
 #include "utils/log.h"
 #include <math.h>
 #include <assert.h>
diff --git a/amiga/theme.c b/amiga/theme.c
index ad538c411..a6fe97d5a 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -29,7 +29,9 @@
 
 #include <gadgets/clicktab.h>
 #include <gadgets/space.h>
+#ifdef __amigaos4__
 #include <graphics/blitattr.h>
+#endif
 #include <intuition/pointerclass.h>
 #include <workbench/icon.h>
 
diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c
index a590a71b6..c7321086a 100755
--- a/amiga/thumbnail.c
+++ b/amiga/thumbnail.c
@@ -20,8 +20,10 @@
 #include <proto/graphics.h>
 #include <proto/Picasso96API.h>
 #include <intuition/intuition.h>
+#ifdef __amigaos4__
 #include <graphics/blitattr.h>
 #include <graphics/composite.h>
+#endif
 #include "amiga/gui.h"
 #include "amiga/bitmap.h"
 #include "amiga/options.h"
-- 
cgit v1.2.3