*
*/
-#ifndef LIBMEMCACHED_BYTEORDER_H
-#define LIBMEMCACHED_BYTEORDER_H
+#ifndef __LIBMEMCACHED_BYTEORDER_H__
+#define __LIBMEMCACHED_BYTEORDER_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.
*/
#include "libmemcached/memcached.h"
#ifndef HAVE_HTONLL
+#define ntohll(a) memcached_ntohll(a)
+#define htonll(a) memcached_htonll(a)
+
LIBMEMCACHED_LOCAL
-uint64_t ntohll(uint64_t);
+uint64_t memcached_ntohll(uint64_t);
LIBMEMCACHED_LOCAL
-uint64_t htonll(uint64_t);
+uint64_t memcached_htonll(uint64_t);
#endif
#ifdef linux
#undef htonl
#endif
-#endif /* LIBMEMCACHED_BYTEORDER_H */
+#endif /*__LIBMEMCACHED_BYTEORDER_H__ */