blob: a46c0c2010d71bed810edb7df2a741c9fa742b18 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
$NetBSD: patch-libvncserver_websockets.c,v 1.1 2012/05/06 09:08:36 obache Exp $
* byte-order handling for !Linux.
--- libvncserver/websockets.c.orig 2012-05-04 14:19:00.000000000 +0000
+++ libvncserver/websockets.c
@@ -31,12 +31,34 @@
/* errno */
#include <errno.h>
-#include <byteswap.h>
#include <string.h>
#include "rfbconfig.h"
#include "rfbssl.h"
#include "rfbcrypto.h"
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#include <sys/endian.h>
+#define WS_NTOH64(n) be64toh(n)
+#define WS_NTOH32(n) be32toh(n)
+#define WS_NTOH16(n) be16toh(n)
+#define WS_HTON64(n) htobe64(n)
+#define WS_HTON16(n) htobe16(n)
+#elif defined(__OpenBSD__)
+#include <sys/types.h>
+#define WS_NTOH64(n) betoh64(n)
+#define WS_NTOH32(n) betoh32(n)
+#define WS_NTOH16(n) betoh16(n)
+#define WS_HTON64(n) htobe64(n)
+#define WS_HTON16(n) htobe16(n)
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define WS_NTOH64(n) OSSwapBigToHostInt64(n)
+#define WS_NTOH32(n) OSSwapBigToHostInt32(n)
+#define WS_NTOH16(n) OSSwapBigToHostInt16(n)
+#define WS_HTON64(n) OSSwapHostToBigInt64(n)
+#define WS_HTON16(n) OSSwapHostToBitInt16(n)
+#else
+#include <byteswap.h>
#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
#define WS_NTOH64(n) (n)
#define WS_NTOH32(n) (n)
@@ -50,6 +72,7 @@
#define WS_HTON64(n) bswap_64(n)
#define WS_HTON16(n) bswap_16(n)
#endif
+#endif
#define B64LEN(__x) (((__x + 2) / 3) * 12 / 3)
#define WSHLENMAX 14 /* 2 + sizeof(uint64_t) + sizeof(uint32_t) */
|
