X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbyteorder.h;h=a7d108d3a6c7c9b8fc2d2c0d5f17d38391754f4d;hb=b6719ab469b16022edd830cb90bc476b17fa6743;hp=f78790a83dce1822b196d4bd9f4c596d7955b5ed;hpb=67456d74f5bd4f354a360d70da503dc58cbe5971;p=awesomized%2Flibmemcached diff --git a/libmemcached/byteorder.h b/libmemcached/byteorder.h index f78790a8..a7d108d3 100644 --- a/libmemcached/byteorder.h +++ b/libmemcached/byteorder.h @@ -37,36 +37,14 @@ #pragma once -#if HAVE_SYS_TYPES_H -#include -#endif - -#ifndef HAVE_HTONLL -#define ntohll(a) memcached_ntohll(a) -#define htonll(a) memcached_htonll(a) - #ifdef __cplusplus extern "C" { #endif -LIBMEMCACHED_LOCAL uint64_t memcached_ntohll(uint64_t); -LIBMEMCACHED_LOCAL + uint64_t memcached_htonll(uint64_t); + #ifdef __cplusplus } #endif - -#endif - -#ifdef linux -/* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to - * optimize the conversion functions, but the prototypes generate warnings - * from gcc. The conversion methods isn't the bottleneck for my app, so - * just remove the warnings by undef'ing the optimization .. - */ -#undef ntohs -#undef ntohl -#undef htons -#undef htonl -#endif