summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-11-09 19:48:31 +0900
committerCedric Bail <cedric.bail@free.fr>2013-11-09 19:48:31 +0900
commit926f4c5e8437b8a61095c636505f447061be60b8 (patch)
tree93c849388c561fd2633b338edd79c995b8e868fc /src/lib
parent76c7b9a275e702497219711ab3c5eefab289d2a1 (diff)
efl: detect 64 bits correctly.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/edje/edje_signal.c2
-rw-r--r--src/lib/eina/eina_config.h.in4
-rw-r--r--src/lib/eina/eina_cow.c4
-rw-r--r--src/lib/eina/eina_hash.c2
-rw-r--r--src/lib/ethumb/ethumb.c2
5 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/edje/edje_signal.c b/src/lib/edje/edje_signal.c
index 1ec9b151d1..b9aa3e9f55 100644
--- a/src/lib/edje/edje_signal.c
+++ b/src/lib/edje/edje_signal.c
@@ -36,7 +36,7 @@ _edje_signal_match_key_hash(const void *key, int key_length EINA_UNUSED)
36 hash = eina_hash_int32(&a->matches_count, sizeof (int)); 36 hash = eina_hash_int32(&a->matches_count, sizeof (int));
37 for (i = 0; i < a->matches_count; ++i) 37 for (i = 0; i < a->matches_count; ++i)
38 { 38 {
39#ifdef __LP64__ 39#ifdef EFL64
40 hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].signal, sizeof (char *)); 40 hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].signal, sizeof (char *));
41 hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].source, sizeof (char *)); 41 hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].source, sizeof (char *));
42 hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].func, sizeof (Edje_Signal_Cb)); 42 hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].func, sizeof (Edje_Signal_Cb));
diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in
index 72e3ed3eeb..5eddfdd61d 100644
--- a/src/lib/eina/eina_config.h.in
+++ b/src/lib/eina/eina_config.h.in
@@ -97,4 +97,8 @@
97#endif 97#endif
98@EINA_CONFIGURE_HAVE_POSIX_SPINLOCK@ 98@EINA_CONFIGURE_HAVE_POSIX_SPINLOCK@
99 99
100#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || defined(__LP64__) || defined(_LP64))
101# define EFL64
102#endif
103
100#endif /* EINA_CONFIG_H_ */ 104#endif /* EINA_CONFIG_H_ */
diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index a2c4e3fbfe..2488648178 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -163,7 +163,7 @@ _eina_cow_hash_gen(const void *key, int key_length,
163 return r; 163 return r;
164} 164}
165 165
166#ifdef __LP64__ 166#ifdef EFL64
167static int 167static int
168_eina_cow_hash64(const void *key, int key_length) 168_eina_cow_hash64(const void *key, int key_length)
169{ 169{
@@ -355,7 +355,7 @@ eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, cons
355 goto on_error; 355 goto on_error;
356 } 356 }
357 357
358#ifdef __LP64__ 358#ifdef EFL64
359 cow->match = eina_hash_new(_eina_cow_length, 359 cow->match = eina_hash_new(_eina_cow_length,
360 _eina_cow_cmp, 360 _eina_cow_cmp,
361 _eina_cow_hash64, 361 _eina_cow_hash64,
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 87dd68679e..0989f68342 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -804,7 +804,7 @@ eina_hash_int64_new(Eina_Free_Cb data_free_cb)
804EAPI Eina_Hash * 804EAPI Eina_Hash *
805eina_hash_pointer_new(Eina_Free_Cb data_free_cb) 805eina_hash_pointer_new(Eina_Free_Cb data_free_cb)
806{ 806{
807#ifdef __LP64__ 807#ifdef EFL64
808 return eina_hash_new(EINA_KEY_LENGTH(_eina_int64_key_length), 808 return eina_hash_new(EINA_KEY_LENGTH(_eina_int64_key_length),
809 EINA_KEY_CMP(_eina_int64_key_cmp), 809 EINA_KEY_CMP(_eina_int64_key_cmp),
810 EINA_KEY_HASH(eina_hash_int64), 810 EINA_KEY_HASH(eina_hash_int64),
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index eab57a2d8f..3c4a96868f 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -1892,7 +1892,7 @@ ethumb_key_cmp(const void *key1, EINA_UNUSED int key1_length,
1892#undef CMP_PARAM 1892#undef CMP_PARAM
1893 1893
1894#define HASH_PARAM_I(Param) r ^= eina_hash_int32((unsigned int*) &e->Param, 0); 1894#define HASH_PARAM_I(Param) r ^= eina_hash_int32((unsigned int*) &e->Param, 0);
1895#ifdef __LP64__ 1895#ifdef EFL64
1896# define HASH_PARAM_P(Param) r ^= eina_hash_int64((unsigned long int*) &e->Param, 0); 1896# define HASH_PARAM_P(Param) r ^= eina_hash_int64((unsigned long int*) &e->Param, 0);
1897#else 1897#else
1898# define HASH_PARAM_P(Param) r ^= eina_hash_int32((unsigned int*) &e->Param, 0); 1898# define HASH_PARAM_P(Param) r ^= eina_hash_int32((unsigned int*) &e->Param, 0);