libmemcached

Merge lp:~mordred/libmemcached/bug560868 into lp:~tangent-org/libmemcached/trunk

  1. bug560868
  2. Merge into trunk
Proposed by Monty Taylor
Status: Rejected
Rejected by: Brian Aker
Proposed branch: lp:~mordred/libmemcached/bug560868
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
tests/hashkit_functions.c (+1/-1)
tests/mem_functions.c (+1/-1)
To merge this branch: bzr merge lp:~mordred/libmemcached/bug560868
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+23187@code.launchpad.net

Description of the change

Swaps a preprocessor define used to disable two tests.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/hashkit_functions.c'
2--- tests/hashkit_functions.c 2010-02-05 01:15:17 +0000
3+++ tests/hashkit_functions.c 2010-04-11 18:01:23 +0000
4@@ -248,7 +248,7 @@
5
6 static test_return_t murmur_run (hashkit_st *hashk __attribute__((unused)))
7 {
8-#ifdef __sparc
9+#ifdef WORDS_BIGENDIAN
10 return TEST_SKIPPED;
11 #else
12 uint32_t x;
13
14=== modified file 'tests/mem_functions.c'
15--- tests/mem_functions.c 2010-04-06 17:22:35 +0000
16+++ tests/mem_functions.c 2010-04-11 18:01:23 +0000
17@@ -4796,7 +4796,7 @@
18
19 static test_return_t murmur_run (memcached_st *memc __attribute__((unused)))
20 {
21-#ifdef __sparc
22+#ifdef WORDS_BIGENDIAN
23 return TEST_SKIPPED;
24 #else
25 uint32_t x;

Subscribers

People subscribed via source and target branches

to all changes: