summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-11-19 16:12:20 (GMT)
committer Chris Young <chris@unsatisfactorysoftware.co.uk>2016-11-19 16:12:20 (GMT)
commit4b1b79582c5de530100b4ddb909163a6fb9b23c8 (patch)
treeeb3b8770a4ab8f6bda79bb78689384e2f527dcc0
parent6951d2327b0f0b6999f66452d5c38d74136cdb12 (diff)
downloadnetsurf-4b1b79582c5de530100b4ddb909163a6fb9b23c8.tar.gz
netsurf-4b1b79582c5de530100b4ddb909163a6fb9b23c8.tar.bz2
Move slab size def into memory.c
-rwxr-xr-xfrontends/amiga/memory.c4
-rw-r--r--frontends/amiga/memory.h1
-rw-r--r--frontends/amiga/menu.c1
-rw-r--r--frontends/amiga/os3support.c2
-rw-r--r--frontends/amiga/plotters.c1
-rw-r--r--frontends/amiga/tree.c1
6 files changed, 8 insertions, 2 deletions
diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index a77d0cc..874f852 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -21,6 +21,10 @@
#include "amiga/memory.h"
+#ifndef __amigaos4__
+ULONG __slab_max_size = 8192; /* Enable clib2's slab allocator */
+#endif
+
void *ami_misc_allocvec_clear(int size, UBYTE value)
{
#ifdef __amigaos4__
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 29a7ae1..1c51f30 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -21,6 +21,7 @@
#include <exec/types.h>
+/* Standard memory allocation */
void *ami_misc_allocvec_clear(int size, UBYTE value);
/* Itempool cross-compatibility */
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 2eda5ff..feb5c29 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -69,6 +69,7 @@
#include "amiga/libs.h"
#include "amiga/menu.h"
#include "amiga/memory.h"
+#include "amiga/misc.h"
#include "amiga/nsoption.h"
#include "amiga/print.h"
#include "amiga/search.h"
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 6722ca8..bdf6333 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -46,8 +46,6 @@
#define FAILURE (FALSE)
#define NO !
-ULONG __slab_max_size = 8192; /* Enable clib2's slab allocator */
-
/* Diskfont */
struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG flags)
{
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 842e1bb..073a95f 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -46,6 +46,7 @@
#include "amiga/font.h"
#include "amiga/gui.h"
#include "amiga/memory.h"
+#include "amiga/misc.h"
#include "amiga/rtg.h"
#include "amiga/utf8.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index 460eb22..eea64ff 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -67,6 +67,7 @@
#include "amiga/file.h"
#include "amiga/libs.h"
#include "amiga/memory.h"
+#include "amiga/misc.h"
#include "amiga/utf8.h"
#include "amiga/sslcert.h"
#include "amiga/drag.h" /* drag icon stuff */