Index: libcfa/src/heap.cfa
===================================================================
--- libcfa/src/heap.cfa	(revision 7671c6d930de5dc5a2cb9067ee379aca834be4d3)
+++ libcfa/src/heap.cfa	(revision 5951956fbc88b6219582b5d4c85e8ca5be8aacf4)
@@ -10,6 +10,6 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct 12 18:06:01 2022
-// Update Count     : 1528
+// Last Modified On : Thu Oct 13 21:41:32 2022
+// Update Count     : 1553
 //
 
@@ -515,4 +515,5 @@
 		} // with
 	} // if
+
 	return heap;
 } // getHeap
@@ -585,5 +586,5 @@
 		// allocUnfreed is set to 0 when a heap is created and it accumulates any unfreed storage during its multiple thread
 		// usages.  At the end, add up each heap allocUnfreed value across all heaps to get the total unfreed storage.
-		long long int allocUnfreed = 0;
+		int64_t allocUnfreed = 0;
 		for ( Heap * heap = heapMaster.heapManagersList; heap; heap = heap->nextHeapManager ) {
 			allocUnfreed += heap->allocUnfreed;
@@ -1042,5 +1043,5 @@
 			if ( errno == ENOMEM ) abort( NO_MEMORY_MSG, tsize ); // no memory
 			// Do not call strerror( errno ) as it may call malloc.
-			abort( "attempt to allocate large object (> %zu) of size %zu bytes and mmap failed with errno %d.", size, heapMaster.mmapStart, errno );
+			abort( "**** Error **** attempt to allocate large object (> %zu) of size %zu bytes and mmap failed with errno %d.", size, heapMaster.mmapStart, errno );
 		} // if
 		block->header.kind.real.blockSize = MarkMmappedBit( tsize ); // storage size for munmap
@@ -1106,5 +1107,5 @@
 		if ( unlikely( munmap( header, size ) == -1 ) ) {
 			// Do not call strerror( errno ) as it may call malloc.
-			abort( "attempt to deallocate large object %p and munmap failed with errno %d.\n"
+			abort( "**** Error **** attempt to deallocate large object %p and munmap failed with errno %d.\n"
 				   "Possible cause is invalid delete pointer: either not allocated or with corrupt header.",
 				   addr, errno );
@@ -1216,9 +1217,9 @@
 
 #ifdef __STATISTICS__
-static void incCalls( long int statName ) libcfa_nopreempt {
+static void incCalls( intptr_t statName ) libcfa_nopreempt {
 	heapManager->stats.counters[statName].calls += 1;
 } // incCalls
 
-static void incZeroCalls( long int statName ) libcfa_nopreempt {
+static void incZeroCalls( intptr_t statName ) libcfa_nopreempt {
 	heapManager->stats.counters[statName].calls_0 += 1;
 } // incZeroCalls
@@ -1226,5 +1227,5 @@
 
 #ifdef __CFA_DEBUG__
-static void incUnfreed( size_t offset ) libcfa_nopreempt {
+static void incUnfreed( intptr_t offset ) libcfa_nopreempt {
 	heapManager->allocUnfreed += offset;
 } // incUnfreed
@@ -1567,5 +1568,5 @@
 		if ( write( STDERR_FILENO, MALLOC_STATS_MSG, sizeof( MALLOC_STATS_MSG ) - 1 /* size includes '\0' */ ) == -1 ) {
 		#endif // __STATISTICS__
-			abort( "write failed in malloc_stats" );
+			abort( "**** Error **** write failed in malloc_stats" );
 		} // if
 	} // malloc_stats