From: Daniele Varrazzo Date: Tue, 29 Jun 2021 02:19:30 +0000 (+0100) Subject: Add windows compatibility to endian functions X-Git-Tag: 3.0.dev0~4^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3626196fb093059062518cf96d96dea93608a1;p=thirdparty%2Fpsycopg.git Add windows compatibility to endian functions --- diff --git a/psycopg_c/psycopg_c/_psycopg/endian.pxd b/psycopg_c/psycopg_c/_psycopg/endian.pxd index 97aded859..43220fdb1 100644 --- a/psycopg_c/psycopg_c/_psycopg/endian.pxd +++ b/psycopg_c/psycopg_c/_psycopg/endian.pxd @@ -1,66 +1,144 @@ -# convert values between host and big-/little-endian byte order -# http://man7.org/linux/man-pages/man3/endian.3.html +""" +Access to endian conversion function +""" + +# Copyright (C) 2020-2021 The Psycopg Team from libc.stdint cimport uint16_t, uint32_t, uint64_t -IF UNAME_SYSNAME == "Darwin": - cdef extern from "" nogil: - cdef uint16_t OSSwapHostToBigInt16(uint16_t x) - cdef uint16_t OSSwapHostToLittleInt16(uint16_t x) - cdef uint16_t OSSwapBigToHostInt16(uint16_t x) - cdef uint16_t OSSwapLittleToHostInt16(uint16_t x) - - cdef uint32_t OSSwapHostToBigInt32(uint32_t x) - cdef uint32_t OSSwapHostToLittleInt32(uint32_t x) - cdef uint32_t OSSwapBigToHostInt32(uint32_t x) - cdef uint32_t OSSwapLittleToHostInt32(uint32_t x) - - cdef uint64_t OSSwapHostToBigInt64(uint64_t x) - cdef uint64_t OSSwapHostToLittleInt64(uint64_t x) - cdef uint64_t OSSwapBigToHostInt64(uint64_t x) - cdef uint64_t OSSwapLittleToHostInt64(uint64_t x) - - cdef inline uint16_t htobe16(uint16_t host_16bits): - return OSSwapHostToBigInt16(host_16bits) - cdef inline uint16_t htole16(uint16_t host_16bits): - return OSSwapHostToLittleInt16(host_16bits) - cdef inline uint16_t be16toh(uint16_t big_endian_16bits): - return OSSwapBigToHostInt16(big_endian_16bits) - cdef inline uint16_t le16toh(uint16_t little_endian_16bits): - return OSSwapLittleToHostInt16(little_endian_16bits) - - cdef inline uint32_t htobe32(uint32_t host_32bits): - return OSSwapHostToBigInt32(host_32bits) - cdef inline uint32_t htole32(uint32_t host_32bits): - return OSSwapHostToLittleInt32(host_32bits) - cdef inline uint32_t be32toh(uint32_t big_endian_32bits): - return OSSwapBigToHostInt32(big_endian_32bits) - cdef inline uint32_t le32toh(uint32_t little_endian_32bits): - return OSSwapLittleToHostInt32(little_endian_32bits) - - cdef inline uint64_t htobe64(uint64_t host_64bits): - return OSSwapHostToBigInt64(host_64bits) - cdef inline uint64_t htole64(uint64_t host_64bits): - return OSSwapHostToLittleInt64(host_64bits) - cdef inline uint64_t be64toh(uint64_t big_endian_64bits): - return OSSwapBigToHostInt64(big_endian_64bits) - cdef inline uint64_t le64toh(uint64_t little_endian_64bits): - return OSSwapLittleToHostInt64(little_endian_64bits) - -ELSE: - cdef extern from "" nogil: - - cdef uint16_t htobe16(uint16_t host_16bits) - cdef uint16_t htole16(uint16_t host_16bits) - cdef uint16_t be16toh(uint16_t big_endian_16bits) - cdef uint16_t le16toh(uint16_t little_endian_16bits) - - cdef uint32_t htobe32(uint32_t host_32bits) - cdef uint32_t htole32(uint32_t host_32bits) - cdef uint32_t be32toh(uint32_t big_endian_32bits) - cdef uint32_t le32toh(uint32_t little_endian_32bits) - - cdef uint64_t htobe64(uint64_t host_64bits) - cdef uint64_t htole64(uint64_t host_64bits) - cdef uint64_t be64toh(uint64_t big_endian_64bits) - cdef uint64_t le64toh(uint64_t little_endian_64bits) +cdef extern from * nogil: + # from https://gist.github.com/panzi/6856583 + """ +// "License": Public Domain +// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like. +// In case there are jurisdictions that don't support putting things in the public domain you can also consider it to +// be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it +// an example on how to get the endian conversion functions on different platforms. + +#ifndef PORTABLE_ENDIAN_H__ +#define PORTABLE_ENDIAN_H__ + +#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__) + +# define __WINDOWS__ + +#endif + +#if defined(__linux__) || defined(__CYGWIN__) + +# include + +#elif defined(__APPLE__) + +# include + +# define htobe16(x) OSSwapHostToBigInt16(x) +# define htole16(x) OSSwapHostToLittleInt16(x) +# define be16toh(x) OSSwapBigToHostInt16(x) +# define le16toh(x) OSSwapLittleToHostInt16(x) + +# define htobe32(x) OSSwapHostToBigInt32(x) +# define htole32(x) OSSwapHostToLittleInt32(x) +# define be32toh(x) OSSwapBigToHostInt32(x) +# define le32toh(x) OSSwapLittleToHostInt32(x) + +# define htobe64(x) OSSwapHostToBigInt64(x) +# define htole64(x) OSSwapHostToLittleInt64(x) +# define be64toh(x) OSSwapBigToHostInt64(x) +# define le64toh(x) OSSwapLittleToHostInt64(x) + +# define __BYTE_ORDER BYTE_ORDER +# define __BIG_ENDIAN BIG_ENDIAN +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __PDP_ENDIAN PDP_ENDIAN + +#elif defined(__OpenBSD__) + +# include + +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) + +# include + +# define be16toh(x) betoh16(x) +# define le16toh(x) letoh16(x) + +# define be32toh(x) betoh32(x) +# define le32toh(x) letoh32(x) + +# define be64toh(x) betoh64(x) +# define le64toh(x) letoh64(x) + +#elif defined(__WINDOWS__) + +# include +# include + +# if BYTE_ORDER == LITTLE_ENDIAN + +# define htobe16(x) htons(x) +# define htole16(x) (x) +# define be16toh(x) ntohs(x) +# define le16toh(x) (x) + +# define htobe32(x) htonl(x) +# define htole32(x) (x) +# define be32toh(x) ntohl(x) +# define le32toh(x) (x) + +# define htobe64(x) htonll(x) +# define htole64(x) (x) +# define be64toh(x) ntohll(x) +# define le64toh(x) (x) + +# elif BYTE_ORDER == BIG_ENDIAN + + /* that would be xbox 360 */ +# define htobe16(x) (x) +# define htole16(x) __builtin_bswap16(x) +# define be16toh(x) (x) +# define le16toh(x) __builtin_bswap16(x) + +# define htobe32(x) (x) +# define htole32(x) __builtin_bswap32(x) +# define be32toh(x) (x) +# define le32toh(x) __builtin_bswap32(x) + +# define htobe64(x) (x) +# define htole64(x) __builtin_bswap64(x) +# define be64toh(x) (x) +# define le64toh(x) __builtin_bswap64(x) + +# else + +# error byte order not supported + +# endif + +# define __BYTE_ORDER BYTE_ORDER +# define __BIG_ENDIAN BIG_ENDIAN +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __PDP_ENDIAN PDP_ENDIAN + +#else + +# error platform not supported + +#endif + +#endif + """ + cdef uint16_t htobe16(uint16_t host_16bits) + cdef uint16_t htole16(uint16_t host_16bits) + cdef uint16_t be16toh(uint16_t big_endian_16bits) + cdef uint16_t le16toh(uint16_t little_endian_16bits) + + cdef uint32_t htobe32(uint32_t host_32bits) + cdef uint32_t htole32(uint32_t host_32bits) + cdef uint32_t be32toh(uint32_t big_endian_32bits) + cdef uint32_t le32toh(uint32_t little_endian_32bits) + + cdef uint64_t htobe64(uint64_t host_64bits) + cdef uint64_t htole64(uint64_t host_64bits) + cdef uint64_t be64toh(uint64_t big_endian_64bits) + cdef uint64_t le64toh(uint64_t little_endian_64bits)