projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
See if this fixes issue with 64bit Ubuntu
[awesomized/libmemcached]
/
libmemcached
/
byteorder.h
diff --git
a/libmemcached/byteorder.h
b/libmemcached/byteorder.h
index 17e66a78f59e0d52ee235b9a08dc53af26cd618e..90a71ee400003932746d479137a225b7f26e5140 100644
(file)
--- a/
libmemcached/byteorder.h
+++ b/
libmemcached/byteorder.h
@@
-9,11
+9,16
@@
*
*/
*
*/
-#ifndef
LIBMEMCACHED_BYTEORDER_H
-#define
LIBMEMCACHED_BYTEORDER_H
+#ifndef
__LIBMEMCACHED_BYTEORDER_H__
+#define
__LIBMEMCACHED_BYTEORDER_H__
#include "config.h"
#include "config.h"
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+
/* Define this here, which will turn on the visibilty controls while we're
* building libmemcached.
*/
/* Define this here, which will turn on the visibilty controls while we're
* building libmemcached.
*/
@@
-22,10
+27,13
@@
#include "libmemcached/memcached.h"
#ifndef HAVE_HTONLL
#include "libmemcached/memcached.h"
#ifndef HAVE_HTONLL
+#define ntohll(a) memcached_ntohll(a)
+#define htonll(a) memcached_htonll(a)
+
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-uint64_t ntohll(uint64_t);
+uint64_t
memcached_
ntohll(uint64_t);
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-uint64_t htonll(uint64_t);
+uint64_t
memcached_
htonll(uint64_t);
#endif
#ifdef linux
#endif
#ifdef linux
@@
-40,4
+48,4
@@
uint64_t htonll(uint64_t);
#undef htonl
#endif
#undef htonl
#endif
-#endif /*
LIBMEMCACHED_BYTEORDER_H
*/
+#endif /*
__LIBMEMCACHED_BYTEORDER_H__
*/