|
@@ -39,11 +39,10 @@
|
|
|
#include <dmmlib/dmmstats.h>
|
|
|
#endif /* WITH_ALLOCATOR_STATS */
|
|
|
|
|
|
-#ifdef PARSE_ENV
|
|
|
-#if defined WITH_MEM_TRACE || defined WITH_STATS_TRACE || defined WITH_DEBUG
|
|
|
+#if defined PARSE_ENV || defined WITH_MEM_TRACE || defined WITH_STATS_TRACE \
|
|
|
+ || defined WITH_DEBUG
|
|
|
#include <stdbool.h>
|
|
|
-#endif /* WITH_MEM_TRACE || WITH_STATS_TRACE || WITH_DEBUG */
|
|
|
-#endif /* PARSE_ENV */
|
|
|
+#endif /* PARSE_ENV || WITH_MEM_TRACE || WITH_STATS_TRACE || WITH_DEBUG */
|
|
|
|
|
|
/** The allocator structure of dmmlib. */
|
|
|
typedef struct allocator_s {
|
|
@@ -64,14 +63,13 @@ typedef struct allocator_s {
|
|
|
dmmstats_t dmm_stats; /**< Global statistics. */
|
|
|
#endif /* WITH_ALLOCATOR_STATS */
|
|
|
|
|
|
-#ifdef PARSE_ENV
|
|
|
-#if defined WITH_MEM_TRACE || defined WITH_STATS_TRACE || defined WITH_DEBUG
|
|
|
+#if defined WITH_MEM_TRACE || defined WITH_STATS_TRACE || defined WITH_DEBUG \
|
|
|
+ || defined PARSE_ENV
|
|
|
/* During initialization it is possible that some files are being opened to
|
|
|
* write the traces, so some dynamic memory is requested. For such cases the
|
|
|
* trace functions should not be run. */
|
|
|
bool initialized; /**< Initialization value. */
|
|
|
-#endif /* WITH_MEM_TRACE || WITH_STATS_TRACE || WITH_DEBUG */
|
|
|
-#endif /* PARSE_ENV */
|
|
|
+#endif /* WITH_MEM_TRACE || WITH_STATS_TRACE || WITH_DEBUG || PARSE_ENV */
|
|
|
|
|
|
} allocator_t;
|
|
|
|