Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c0a15de1e4609e942c037c340c5fed3c5bce839d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c0a15de1e4609e942c037c340c5fed3c5bce839d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c0a15de1e4609e942c037c340c5fed3c5bce839d
The branch, master has been updated
via c0a15de1e4609e942c037c340c5fed3c5bce839d (commit)
via 2b6a416970f3eff764f4a053cdade46566ce7dc7 (commit)
from f38b72a5833bfd9967308d6667c45c58a0ed10b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c0a15de1e4609e942c037c340c5fed3c5bce839d
commit c0a15de1e4609e942c037c340c5fed3c5bce839d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Ensure pool init returns non-NULL so it isn't treated as an error.
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 93201a2..7d13349 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -51,7 +51,7 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p)
#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i)
#else
-#define ami_memory_itempool_create(s) (NULL)
+#define ami_memory_itempool_create(s) ((APTR)1)
#define ami_memory_itempool_delete(p) ((void)0)
#define ami_memory_itempool_alloc(p,s) malloc(s)
#define ami_memory_itempool_free(p,i,s) free(p)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2b6a416970f3eff764f4a053cdade46566ce7dc7
commit 2b6a416970f3eff764f4a053cdade46566ce7dc7
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Replace custom itempool functions with malloc/free as clib handles these
more efficiently than our pools.
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 7abf0a3..93201a2 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -51,10 +51,10 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p)
#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i)
#else
-#define ami_memory_itempool_create(s) CreatePool(MEMF_ANY, 20 * s, s)
-#define ami_memory_itempool_delete(p) DeletePool(p)
-#define ami_memory_itempool_alloc(p,s) AllocPooled(p, s)
-#define ami_memory_itempool_free(p,i,s) FreePooled(p,i,s)
+#define ami_memory_itempool_create(s) (NULL)
+#define ami_memory_itempool_delete(p) ((void)0)
+#define ami_memory_itempool_alloc(p,s) malloc(s)
+#define ami_memory_itempool_free(p,i,s) free(p)
#endif
/* clib2 slab allocator */
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/memory.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 7abf0a3..7d13349 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -51,10 +51,10 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p)
#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i)
#else
-#define ami_memory_itempool_create(s) CreatePool(MEMF_ANY, 20 * s, s)
-#define ami_memory_itempool_delete(p) DeletePool(p)
-#define ami_memory_itempool_alloc(p,s) AllocPooled(p, s)
-#define ami_memory_itempool_free(p,i,s) FreePooled(p,i,s)
+#define ami_memory_itempool_create(s) ((APTR)1)
+#define ami_memory_itempool_delete(p) ((void)0)
+#define ami_memory_itempool_alloc(p,s) malloc(s)
+#define ami_memory_itempool_free(p,i,s) free(p)
#endif
/* clib2 slab allocator */
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org