projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in bug fix for 456080.
[m6w6/libmemcached]
/
libmemcached
/
byteorder.c
diff --git
a/libmemcached/byteorder.c
b/libmemcached/byteorder.c
index 5b1cf88bc8d0090a2ac9840783791c9cec861a20..97d14f2b0f83fd49c86b4440dbddf12bc41afe64 100644
(file)
--- a/
libmemcached/byteorder.c
+++ b/
libmemcached/byteorder.c
@@
-1,14
+1,25
@@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license. See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
#include "byteorder.h"
/* Byte swap a 64-bit number. */
#include "byteorder.h"
/* Byte swap a 64-bit number. */
+#ifndef swap64
static inline uint64_t swap64(uint64_t in)
{
static inline uint64_t swap64(uint64_t in)
{
-#ifndef
BYTEORDER_BIG_
ENDIAN
+#ifndef
WORDS_BIG
ENDIAN
/* Little endian, flip the bytes around until someone makes a faster/better
* way to do this. */
uint64_t rv= 0;
/* Little endian, flip the bytes around until someone makes a faster/better
* way to do this. */
uint64_t rv= 0;
- uint8_t x= 0;
- for(x= 0; x < 8; x++)
+ for (uint8_t x= 0; x < 8; x++)
{
rv= (rv << 8) | (in & 0xff);
in >>= 8;
{
rv= (rv << 8) | (in & 0xff);
in >>= 8;
@@
-17,15
+28,16
@@
static inline uint64_t swap64(uint64_t in)
#else
/* big-endian machines don't need byte swapping */
return in;
#else
/* big-endian machines don't need byte swapping */
return in;
-#endif
+#endif
// WORDS_BIGENDIAN
}
}
+#endif
-uint64_t ntohll(uint64_t value)
+uint64_t
memcached_
ntohll(uint64_t value)
{
return swap64(value);
}
{
return swap64(value);
}
-uint64_t htonll(uint64_t value)
+uint64_t
memcached_
htonll(uint64_t value)
{
return swap64(value);
}
{
return swap64(value);
}