@@ -126,11 +126,11 @@ # endif page = preallocatedPages[numPreallocatedPages]; if (numPreallocatedPages == 0) { - of_free(preallocatedPages); + free(preallocatedPages); preallocatedPages = NULL; # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS) OF_ENSURE(of_tlskey_set(preallocatedPagesKey, preallocatedPages)); # endif @@ -142,18 +142,18 @@ page = of_malloc(1, sizeof(*page)); @try { page->map = of_calloc(1, mapSize); } @catch (id e) { - of_free(page); + free(page); @throw e; } @try { page->page = mapPages(1); } @catch (id e) { - of_free(page->map); - of_free(page); + free(page->map); + free(page); @throw e; } of_explicit_memset(page->page, 0, pageSize); # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS) @@ -191,11 +191,11 @@ for (size_t i = 0; i < mapSize; i++) if (map[i] != 0) return; unmapPages(page->page, 1); - of_free(page->map); + free(page->map); if (page->previous != NULL) page->previous->next = page->next; if (page->next != NULL) page->next->previous = page->previous; @@ -210,11 +210,11 @@ OF_ENSURE(of_tlskey_set(firstPageKey, page->next)); if (of_tlskey_get(lastPageKey) == page) OF_ENSURE(of_tlskey_set(lastPageKey, page->previous)); # endif - of_free(page); + free(page); } static void * allocateMemory(struct page *page, size_t bytes) { @@ -304,11 +304,11 @@ preallocatedPages[i] = addPage(false); } @catch (id e) { for (size_t j = 0; j < i; j++) removePageIfEmpty(preallocatedPages[j]); - of_free(preallocatedPages); + free(preallocatedPages); preallocatedPages = NULL; @throw e; }