Skip to content

Adjustments for compilation on MSVC and windows compilers in general #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bk138 merged 6 commits into from
Sep 1, 2014
Merged

Adjustments for compilation on MSVC and windows compilers in general #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7013d7b
C90 compatibility
danielgindi Aug 29, 2014
d5dd913
Winsock2 should be included before any windows.h include.
danielgindi Aug 29, 2014
1088a9e
MSVC compatibility - WIN32 is a global definition for all windows com…
danielgindi Aug 29, 2014
676aac5
MSVC compatible unix headers
danielgindi Aug 29, 2014
0ac3f63
A void* pointer cannot be used for arithmetic operations in most comp…
danielgindi Aug 29, 2014
948ced1
pthread is the unix way of doing threads and mutexes.
danielgindi Aug 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Winsock2 should be included before any windows.h include. 
That's because there are duplicate #defines, and when Winsock2 is defined before windows.h then windows.h detects that and prevent redefinition.
That is the official way stated by Microsoft.
  • Loading branch information
@danielgindi
danielgindi committed Aug 29, 2014
commit d5dd91312d288525ef9715892426d843f9e4c4eb
7 changes: 5 additions & 2 deletions src/libvncclient/vncviewer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
* vncviewer.c - the Xt-based VNC viewer.
*/

#ifdef WIN32
#undef SOCKET
#include <winsock2.h>
#endif

#ifdef __STRICT_ANSI__
#define _BSD_SOURCE
#define _POSIX_SOURCE
Expand All @@ -45,8 +50,6 @@ static void DummyRect(rfbClient* client, int x, int y, int w, int h) {
static char* NoPassword(rfbClient* client) {
return strdup("");
}
#undef SOCKET
#include <winsock2.h>
#define close closesocket
#else
#include <stdio.h>
Expand Down
11 changes: 6 additions & 5 deletions src/rfb/rfbclient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
/**
* @file rfbclient.h
*/

#ifdef WIN32
#undef SOCKET
#undef socklen_t
#include <ws2tcpip.h>
#endif

#include <stdio.h>
#include <stdlib.h>
Expand All @@ -38,11 +44,6 @@
#include <unistd.h>
#include <rfb/rfbproto.h>
#include <rfb/keysym.h>
#ifdef __MINGW32__
#undef SOCKET
#undef socklen_t
#include <ws2tcpip.h>
#endif

#define rfbClientSwap16IfLE(s) \
(*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
Expand Down