From d25c217964eb1fe54c3a54bca4cac7f47b4b9fdf Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 14 Jan 2013 14:24:36 -0800
Subject: Clean up a couple of warnings in os/

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
 os/connection.c | 2 +-
 os/xstrans.c    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/os/connection.c b/os/connection.c
index 6cd8bcf43..162e1d93e 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -923,7 +923,7 @@ ErrorConnMax(XtransConnInfo trans_conn)
         iov[0].iov_len = sz_xConnSetupPrefix;
         iov[0].iov_base = (char *) &csp;
         iov[1].iov_len = csp.lengthReason;
-        iov[1].iov_base = NOROOM;
+        iov[1].iov_base = (void *) NOROOM;
         iov[2].iov_len = (4 - (csp.lengthReason & 3)) & 3;
         iov[2].iov_base = pad;
         (void) _XSERVTransWritev(trans_conn, iov, 3);
diff --git a/os/xstrans.c b/os/xstrans.c
index 6348a6511..2bc79e7ae 100644
--- a/os/xstrans.c
+++ b/os/xstrans.c
@@ -5,9 +5,11 @@
 #include <X11/Xfuncproto.h>
 
 /* ErrorF is used by xtrans */
+#ifndef HAVE_DIX_CONFIG_H
 extern _X_EXPORT void
 ErrorF(const char *f, ...)
 _X_ATTRIBUTE_PRINTF(1, 2);
+#endif
 
 #define TRANS_REOPEN
 #define TRANS_SERVER
-- 
cgit v1.2.3