summaryrefslogtreecommitdiffstats
path: root/libvncserver/tightvnc-filetransfer/filetransfermsg.c
diff options
context:
space:
mode:
authorDaniel Cohen Gindi <danielgindi@gmail.com>2014-09-20 16:42:38 +0300
committerDaniel Cohen Gindi <danielgindi@gmail.com>2014-09-20 17:46:31 +0300
commit51d0db710717be84c62c24ce9f8b99e98728cc1c (patch)
treed1bfd5cd1add96bdefff6f01262a51cc53af0cae /libvncserver/tightvnc-filetransfer/filetransfermsg.c
parentb2b705aa33be8140f735fc993928513ff00968d3 (diff)
downloadlibtdevnc-51d0db710717be84c62c24ce9f8b99e98728cc1c.tar.gz
libtdevnc-51d0db710717be84c62c24ce9f8b99e98728cc1c.zip
`CreateDirectory` might clash with the `CreateDirectoryA`/`CreateDirectoryW` macros on MSVC
Diffstat (limited to 'libvncserver/tightvnc-filetransfer/filetransfermsg.c')
-rw-r--r--libvncserver/tightvnc-filetransfer/filetransfermsg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libvncserver/tightvnc-filetransfer/filetransfermsg.c b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
index 3cda84a..4e18813 100644
--- a/libvncserver/tightvnc-filetransfer/filetransfermsg.c
+++ b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
@@ -627,6 +627,10 @@ CloseUndoneFileTransfer(rfbClientPtr cl, rfbTightClientPtr rtcp)
* Method to handle create directory request.
******************************************************************************/
+#ifdef _MSC_VER
+#undef CreateDirectory /* Prevent macro clashes under Windows */
+#endif /* _MSC_VER */
+
void
CreateDirectory(char* dirName)
{
@@ -637,4 +641,3 @@ CreateDirectory(char* dirName)
__FILE__, __FUNCTION__, dirName);
}
}
-