tobeamended

2 files changed, 13 insertions, 4 deletions

diff --git a/include/dynarray.h b/include/dynarray.h
index bdb9db9..79b548e 100644
--- a/include/dynarray.h
+++ b/include/dynarray.h
@@ -63,7 +63,7 @@
 /// set capacity to minimum possible value
 #define array_shrink(array)	array = _memshrink_array(array)
 /// bound-checks and returns a pointer to that element. on error returns NULL 
-#define array_at(array, idx)	(idx < array_size(array) ? array[idx] : NULL)
+#define array_at(array, idx)	(idx < array_size(array) ? (typeof(array))((byte*)array + idx*array_size(array)) : NULL)
 /// sorts the array using compare_func for comparison
 #define array_qsort(array, compare_func) qsort(array, array_size(array), array_element_size(array), compare_func)
 /// sorts the array using pre-defined compariton functions for signed integers based on size (1, 2, 4, 8)
diff --git a/include/utility.h b/include/utility.h
index 4f264f0..e3e4639 100644
--- a/include/utility.h
+++ b/include/utility.h
@@ -11,7 +11,7 @@ typedef unsigned char byte;
 
 typedef int(*qsort_cmp_t)(const void*, const void*);
 #define get_qsort_cmp(type) __qsort_cmps[sizeof(type)]
-extern const qsort_cmp_t __qsort_cmps[];
+extern const qsort_cmp_t __qsort_cmps[64];
 
 #ifdef UTILITY_EXPOSE_HELPERS
 	#define _UTILITY_STATIC 
@@ -58,17 +58,26 @@ _UTILITY_STATIC int __default_long_cmp(const void* a, const void* b) {
 	return 0;
 }
 
+#ifdef __GNUC__
 // cope
 #pragma GCC diagnostic ignored "-Woverride-init" // Is is meant to override it on different platforms
-const qsort_cmp_t __qsort_cmps[] = {
+const qsort_cmp_t __qsort_cmps[64] = {
 	[sizeof(char)] = __default_char_cmp,
 	[sizeof(short)] = __default_short_cmp,
 	[sizeof(int)] = __default_int_cmp,
 	[sizeof(long)] = __default_long_cmp,
 	[sizeof(long long)] = __default_long_long_cmp,
-	[64] = 0,
+	[63] = 0,
 };
 #pragma GCC diagnostic warning "-Woverride-init"
+#else 	// not __GNUC__
+const qsort_cmp_t __qsort_cmps[64] = {
+	0, 
+	__default_char_cmp, __default_short_cmp, 0, __default_int_cmp, 
+	0, 0, 0, __default_long_long_cmp,
+};
+#endif 	// __GNUC__
+
 
 #endif // UTILITY_IMPLEMENTATION