xtrans: fix #ifdef leading to undefined symbol SUN_LEN

We don't #define this macro (yet?).
This commit is contained in:
François Revol
2016-01-17 19:12:24 +01:00
parent 6f0d12ba96
commit 696dbc70af
2 changed files with 39 additions and 1 deletions

View File

@@ -0,0 +1,37 @@
From bd1da7692120fbfb13a2295abeb9b20d69291296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 17 Jan 2016 15:50:52 +0100
Subject: [PATCH] Xtranssock.c: Haiku has BSD UNIX socket but not SUN_LEN
(yet?)
The test seems quite incorrect and results in SUN_LEN as an undefined symbol on Haiku.
---
Xtranssock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Xtranssock.c b/Xtranssock.c
index d830e7c..f7c1637 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -1129,7 +1129,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, const char *port,
sockname.sun_len = strlen(sockname.sun_path);
#endif
-#if defined(BSD44SOCKETS) || defined(SUN_LEN)
+#if defined(BSD44SOCKETS) && defined(SUN_LEN)
namelen = SUN_LEN(&sockname);
#else
namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
@@ -2003,7 +2003,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr,
sockname.sun_len = strlen (sockname.sun_path);
#endif
-#if defined(BSD44SOCKETS) || defined(SUN_LEN)
+#if defined(BSD44SOCKETS) && defined(SUN_LEN)
namelen = SUN_LEN (&sockname);
#else
namelen = strlen (sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
--
2.7.0

View File

@@ -10,9 +10,10 @@ COPYRIGHT="1993, 1994, 1998 The Open Group
1996 Sebastien Marineau, Holger Veit
2003 Keith Packard, Noah Levitt"
LICENSE="MIT (no promotion)"
REVISION="1"
REVISION="2"
SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.3.5.tar.gz"
CHECKSUM_SHA256="b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"
PATCHES="xtrans-1.3.5.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"