Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
L
libvncserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
rasky
libvncserver
Commits
51d0db71
Commit
51d0db71
authored
Sep 20, 2014
by
Daniel Cohen Gindi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
`CreateDirectory` might clash with the `CreateDirectoryA`/`CreateDirectoryW` macros on MSVC
parent
b2b705aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
filetransfermsg.c
libvncserver/tightvnc-filetransfer/filetransfermsg.c
+4
-1
filetransfermsg.h
libvncserver/tightvnc-filetransfer/filetransfermsg.h
+9
-0
No files found.
libvncserver/tightvnc-filetransfer/filetransfermsg.c
View file @
51d0db71
...
...
@@ -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
);
}
}
libvncserver/tightvnc-filetransfer/filetransfermsg.h
View file @
51d0db71
...
...
@@ -26,6 +26,11 @@
#ifndef FILE_TRANSFER_MSG_H
#define FILE_TRANSFER_MSG_H
#ifdef _MSC_VER
#pragma push_macro("CreateDirectory")
#undef CreateDirectory
/* Prevent macro clashes under Windows */
#endif
/* _MSC_VER */
typedef
struct
_FileTransferMsg
{
char
*
data
;
unsigned
int
length
;
...
...
@@ -50,5 +55,9 @@ void CloseUndoneFileTransfer(rfbClientPtr cl, rfbTightClientPtr data);
void
FreeFileTransferMsg
(
FileTransferMsg
ftm
);
#ifdef _MSC_VER
# pragma pop_macro("CreateDirectory")
/* Restore original macro */
#endif
/* _MSC_VER */
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment