Stefan Dirsch
1a6856d037
Fix build with xtrans 1.3 OBS-URL: https://build.opensuse.org/request/show/205639 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libFS?expand=0&rev=13
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From 19ca53de0aae67b1f23085c832b445576c6a0b25 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Fri, 01 Nov 2013 15:14:58 +0000
|
|
Subject: Fix build with xtrans 1.3
|
|
|
|
->Readv was in fact being used, oops. Just call straight down to
|
|
readv() instead.
|
|
|
|
Reviewed-by: Peter Harris <pharris@opentext.com>
|
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
---
|
|
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
|
|
index edc66ba..0fabc96 100644
|
|
--- a/src/FSlibInt.c
|
|
+++ b/src/FSlibInt.c
|
|
@@ -58,6 +58,7 @@ in this Software without prior written authorization from The Open Group.
|
|
#endif
|
|
#include <stdio.h>
|
|
#include "FSlibint.h"
|
|
+#include <X11/Xtrans/Xtransint.h>
|
|
#include <X11/Xos.h>
|
|
|
|
static void _EatData32 ( FSServer *svr, unsigned long n );
|
|
@@ -360,7 +361,7 @@ _FSReadPad(
|
|
size += iov[1].iov_len;
|
|
|
|
ESET(0);
|
|
- while ((bytes_read = _FSTransReadv(svr->trans_conn, iov, 2)) != size) {
|
|
+ while ((bytes_read = readv(svr->trans_conn->fd, iov, 2)) != size) {
|
|
|
|
if (bytes_read > 0) {
|
|
size -= bytes_read;
|
|
--
|
|
cgit v0.9.0.2-2-gbebe
|