diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-28 08:34:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-28 08:34:35 +0000 |
| commit | 39339fcb860cb48b4f988f5eed31f8d7d2fc1464 (patch) | |
| tree | 84ecdb55b6759e58969e7e8e3e36a6d361e1c90a /libxcb/src/xcb_util.c | |
| parent | 613fdaf384eb16a4d7058dcbfbca9f43e44e063d (diff) | |
| parent | dc0f390b45a3037c85163b8a9e945a31f5756690 (diff) | |
| download | vcxsrv-39339fcb860cb48b4f988f5eed31f8d7d2fc1464.tar.gz vcxsrv-39339fcb860cb48b4f988f5eed31f8d7d2fc1464.tar.bz2 vcxsrv-39339fcb860cb48b4f988f5eed31f8d7d2fc1464.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libxcb/src/xcb_util.c')
| -rw-r--r-- | libxcb/src/xcb_util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c index 538fdf460..e5b874e38 100644 --- a/libxcb/src/xcb_util.c +++ b/libxcb/src/xcb_util.c @@ -55,6 +55,9 @@ #include "xcbint.h"
#ifdef _MSC_VER
+#ifdef close
+#undef close
+#endif
#define close(fd) closesocket(fd)
#endif
|