diff options
author | marha <marha@users.sourceforge.net> | 2013-12-22 22:04:41 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-12-22 22:06:29 +0100 |
commit | 66215bff25b8961e396ea4a3b1847ac668de3ff4 (patch) | |
tree | 64e98f6dabdd61a56aa92264176c07d1aa0807df /xorg-server/os | |
parent | 1d03b6f684ab1ea6772f00058605a9ebb2910628 (diff) | |
download | vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.gz vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.bz2 vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.zip |
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server/os')
-rw-r--r-- | xorg-server/os/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index ff3b7e40a..f878f28b2 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -2130,6 +2130,7 @@ FormatUInt64Hex(uint64_t num, char *string) string[len] = '\0'; } +#ifndef _MSC_VER /* Move a file descriptor out of the way of our select mask; this * is useful for file descriptors which will never appear in the * select mask to avoid reducing the number of clients that can @@ -2153,3 +2154,4 @@ os_move_fd(int fd) close(fd); return newfd; } +#endif |