Move the array library into the data module.

diff --git a/mach/proto/mcg/build.lua b/mach/proto/mcg/build.lua
index b9440a7..dc35042 100644 (file)
--- a/mach/proto/mcg/build.lua
+++ b/mach/proto/mcg/build.lua
@@ -16,6 +16,7 @@ cprogram {
                "h+emheaders",
                "modules+headers",
                "modules/src/alloc+lib",
+               "modules/src/data+lib",
                "modules/src/em_code+lib_k",
                "modules/src/em_data+lib",
                "modules/src/idf+lib",

diff --git a/mach/proto/mcg/array.c b/modules/src/data/array.c
similarity index 93%
rename from mach/proto/mcg/array.c
rename to modules/src/data/array.c
index a375baf..9f61d28 100644 (file)
--- a/mach/proto/mcg/array.c
+++ b/modules/src/data/array.c
@@ -1,4 +1,5 @@
-#include "mcg.h"
+#include <stdlib.h>
+#include <stdbool.h>
 #include "array.h"
 
 void array_append(void*** array, int* count, int* max, void* value)
@@ -7,8 +8,6 @@ void array_append(void*** array, int* count, int* max, void* value)
        {
                int newmax = (*max == 0) ? 8 : (*max * 2);
                void** newarray = realloc(*array, newmax * sizeof(void*));
-               if (!newarray)
-                       fatal("memory allocation failure");
 
                *max = newmax;
                *array = newarray;

diff --git a/mach/proto/mcg/array.h b/modules/src/data/array.h
similarity index 100%
rename from mach/proto/mcg/array.h
rename to modules/src/data/array.h