Changeset 34120f10 in mainline for common/include/adt/hash.h

Timestamp:

2023-10-27T19:38:31Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

63ed840

Parents:

c89ae25 (diff), 694ca3d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge code deduplication work

TL;DR: Added directory /common, which now contains the sole existing
copy of ADT, printf_core, and a few other pieces. Should make changes
to any of those less of a headache.

File:

• common/include/adt/hash.h (moved) (moved from uspace/lib/c/include/adt/hash.h ) (2 diffs)

common/include/adt/hash.h

@@ -35 +35 @@
 #define _LIBC_ADT_HASH_H_
 
+#include <stddef.h>
 #include <stdint.h>
-#include <types/common.h>
 
 /** Produces a uniform hash affecting all output bits from the skewed input. */
@@ -78 +78 @@
 static inline size_t hash_mix(size_t hash)
 {
-#ifdef __32_BITS__
-        return hash_mix32(hash);
-#elif defined(__64_BITS__)
-        return hash_mix64(hash);
-#else
-#error Unknown size_t size - cannot select proper hash mix function.
-#endif
+        if (sizeof(long) == 4)
+                return hash_mix32(hash);
+        else
+                return hash_mix64(hash);
 }