diff --git a/fio-stl.h b/fio-stl.h index 3d711e7..4097bf4 100644 --- a/fio-stl.h +++ b/fio-stl.h @@ -2176,7 +2176,6 @@ Everything Inclusion #define FIO_CRYPT #define FIO_SIGNAL #define FIO_SOCK -#define FIO_STATE #define FIO_THREADS #else @@ -2261,8 +2260,10 @@ Core Inclusion #undef FIO_LOG #undef FIO_MATH #undef FIO_RAND +#undef FIO_STATE #undef FIO_TIME #undef FIO_URL +#undef FIO_CORE #define FIO_ATOL #define FIO_ATOMIC #define FIO_FILES @@ -2270,9 +2271,9 @@ Core Inclusion #define FIO_LOG #define FIO_MATH #define FIO_RAND +#define FIO_STATE #define FIO_TIME #define FIO_URL -#undef FIO_CORE #endif /* ***************************************************************************** diff --git a/fio-stl/000 dependencies.h b/fio-stl/000 dependencies.h index 01f1bd2..400446f 100644 --- a/fio-stl/000 dependencies.h +++ b/fio-stl/000 dependencies.h @@ -67,7 +67,6 @@ Everything Inclusion #define FIO_CRYPT #define FIO_SIGNAL #define FIO_SOCK -#define FIO_STATE #define FIO_THREADS #else @@ -152,8 +151,10 @@ Core Inclusion #undef FIO_LOG #undef FIO_MATH #undef FIO_RAND +#undef FIO_STATE #undef FIO_TIME #undef FIO_URL +#undef FIO_CORE #define FIO_ATOL #define FIO_ATOMIC #define FIO_FILES @@ -161,9 +162,9 @@ Core Inclusion #define FIO_LOG #define FIO_MATH #define FIO_RAND +#define FIO_STATE #define FIO_TIME #define FIO_URL -#undef FIO_CORE #endif /* ***************************************************************************** diff --git a/tests/malloc.c b/tests/malloc.c index 5535a57..64528c6 100644 --- a/tests/malloc.c +++ b/tests/malloc.c @@ -1,3 +1,7 @@ +#define FIO_CORE +#define FIO_CLI +#define FIO_THREADS +#include /* use the fast-setup global allocator shortcut for FIO_MEMORY_NAME */ #define FIO_MEMORY_INITIALIZE_ALLOCATIONS 0 #define FIO_MALLOC @@ -8,15 +12,7 @@ */ #define FIO_MEMORY_ARENA_COUNT 2 #endif - -#define FIO_LOG -#define FIO_TIME -#define FIO_ATOMIC -#define FIO_THREADS -#include -#define FIO_CLI -#define FIO_MALLOC_TMP_USE_SYSTEM 1 -#include +#include FIO_INCLUDE_FILE #include #include