# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

--- src/icetrans.c.orig	2006-07-11 16:41:03.000000000 -0400

+++ src/icetrans.c	2008-02-08 18:29:40.557095000 -0500

@@ -26,8 +26,31 @@

 #include <config.h>

 #endif

+#ifndef ICE_t

 #define ICE_t

+#endif

+

+#ifndef TRANS_CLIENT

 #define TRANS_CLIENT

+#endif

+

+#ifndef TRANS_SERVER

 #define TRANS_SERVER

+#endif

+

+#ifndef TCPCONN

+#define TCPCONN

+#endif

+

+#ifndef UNIXCONN

+#define UNIXCONN

+#endif

+

+#ifdef LOCALCONN

+#undef LOCALCONN

+#endif

+

+#include <sys/filio.h>

 #include <X11/Xtrans/transport.c>

+