diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /X11/xtrans/Xtrans.h | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'X11/xtrans/Xtrans.h')
| -rw-r--r-- | X11/xtrans/Xtrans.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/X11/xtrans/Xtrans.h b/X11/xtrans/Xtrans.h index 5eac908d0..6f8f909c8 100644 --- a/X11/xtrans/Xtrans.h +++ b/X11/xtrans/Xtrans.h @@ -162,7 +162,7 @@ typedef long BytesReadable_t; #endif -#if defined(WIN32) || defined(USG) +#if defined(WIN32) || defined(USG) /* * TRANS(Readv) and TRANS(Writev) use struct iovec, normally found @@ -437,13 +437,13 @@ TRANS(GetPeerNetworkId)( #endif /* ICE_t */ -int +int TRANS(GetHostname) ( char * /* buf */, int /* maxlen */ ); -#if defined(WIN32) && defined(TCPCONN) +#if defined(WIN32) && defined(TCPCONN) int TRANS(WSAStartup)(); #endif |