eina: fix eina_hash_int64 on Windows system.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index 5a0250cc4a..7b05b3b249 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -142,18 +142,18 @@ eina_file_map_key_length(const void *key EINA_UNUSED)
 }
 
 int
-eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED,
-                       const unsigned long int *key2, int key2_length EINA_UNUSED)
+eina_file_map_key_cmp(const unsigned long long int *key1, int key1_length EINA_UNUSED,
+                       const unsigned long long int *key2, int key2_length EINA_UNUSED)
 {
    if (key1[0] - key2[0] == 0) return key1[1] - key2[1];
    return key1[0] - key2[0];
 }
 
 int
-eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED)
+eina_file_map_key_hash(const unsigned long long int *key, int key_length EINA_UNUSED)
 {
-   return eina_hash_int64(&key[0], sizeof (unsigned long int))
-     ^ eina_hash_int64(&key[1], sizeof (unsigned long int));
+   return eina_hash_int64(&key[0], sizeof (unsigned long long int))
+     ^ eina_hash_int64(&key[1], sizeof (unsigned long long int));
 }
 
 void *
diff --git a/src/lib/eina/eina_file_common.h b/src/lib/eina/eina_file_common.h
index 06e9a93143..0ac704d028 100644
--- a/src/lib/eina/eina_file_common.h
+++ b/src/lib/eina/eina_file_common.h
@@ -139,8 +139,8 @@ void eina_file_virtual_map_free(Eina_File *file, void *map);
 
 // Common hash function
 unsigned int eina_file_map_key_length(const void *key);
-int eina_file_map_key_cmp(const unsigned long int *key1, int key1_length,
-                          const unsigned long int *key2, int key2_length);
-int eina_file_map_key_hash(const unsigned long int *key, int key_length);
+int eina_file_map_key_cmp(const unsigned long long int *key1, int key1_length,
+                          const unsigned long long int *key2, int key2_length);
+int eina_file_map_key_hash(const unsigned long long int *key, int key_length);
 
 #endif /* EINA_FILE_COMMON_H_ */
diff --git a/src/lib/eina/eina_hash.h b/src/lib/eina/eina_hash.h
index 4f4aac9a50..c75db25b47 100644
--- a/src/lib/eina/eina_hash.h
+++ b/src/lib/eina/eina_hash.h
@@ -1026,7 +1026,7 @@ static inline int eina_hash_djb2_len(const char *key,
 /* Hash function from http://www.concentric.net/~Ttwang/tech/inthash.htm */
 static inline int eina_hash_int32(const unsigned int *pkey,
                                   int                 len) EINA_ARG_NONNULL(1);
-static inline int eina_hash_int64(const unsigned long int *pkey,
+static inline int eina_hash_int64(const unsigned long long int *pkey,
                                   int                      len) EINA_ARG_NONNULL(1);
 /* http://sites.google.com/site/murmurhash/ */
 static inline int eina_hash_murmur3(const char *key,
diff --git a/src/lib/eina/eina_inline_hash.x b/src/lib/eina/eina_inline_hash.x
index 29264b15eb..630e3479ba 100644
--- a/src/lib/eina/eina_inline_hash.x
+++ b/src/lib/eina/eina_inline_hash.x
@@ -72,9 +72,9 @@ eina_hash_int32(const unsigned int *pkey, int len)
 }
 
 static inline int
-eina_hash_int64(const unsigned long int *pkey, int len)
+eina_hash_int64(const unsigned long long int *pkey, int len)
 {
-   unsigned long int key = *pkey;
+   unsigned long long int key = *pkey;
 
    (void) len;