aboutsummaryrefslogtreecommitdiff
path: root/X11/xtrans/Xtransutil.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-02 21:09:13 +0000
committermarha <marha@users.sourceforge.net>2009-09-02 21:09:13 +0000
commit8fedf58693f42869528b41408ac4d6012839e973 (patch)
tree62a817bea7dfc71050292d302ba94f5e349c67a7 /X11/xtrans/Xtransutil.c
parentac14083f465166b298162a57fff0bad90e528fff (diff)
parent6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff)
downloadvcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz
vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2
vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'X11/xtrans/Xtransutil.c')
-rw-r--r--X11/xtrans/Xtransutil.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/X11/xtrans/Xtransutil.c b/X11/xtrans/Xtransutil.c
index a0c45dc89..42f09c4d1 100644
--- a/X11/xtrans/Xtransutil.c
+++ b/X11/xtrans/Xtransutil.c
@@ -225,6 +225,13 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
#ifdef ICE_t
+/* Needed for _XGethostbyaddr usage in TRANS(GetPeerNetworkId) */
+# if defined(TCPCONN) || defined(UNIXCONN)
+# define X_INCLUDE_NETDB_H
+# define XOS_USE_NO_LOCKING
+# include <X11/Xos_r.h>
+# endif
+
#include <signal.h>
char *
@@ -438,10 +445,10 @@ TRANS(WSAStartup) (void)
}
#endif
+#include <ctype.h>
static int
-is_numeric (char *str)
-
+is_numeric (const char *str)
{
int i;
@@ -472,7 +479,7 @@ is_numeric (char *str)
* bit cannot be set and fail.
*/
static int
-trans_mkdir(char *path, int mode)
+trans_mkdir(const char *path, int mode)
{
struct stat buf;