diff options
| author | DRC <dcommander@users.sourceforge.net> | 2013-02-26 10:34:22 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2013-02-26 10:34:22 +0000 |
| commit | 3e7ed8164f77dfdfe62d8bedd35e48d3a8ae575a (patch) | |
| tree | 64b41bc5def3bf5c3f8015bdc48092eef6b66e9b /vncviewer | |
| parent | faad79dd78a348a092141a633277b3b6025f82ee (diff) | |
| download | tigervnc-3e7ed8164f77dfdfe62d8bedd35e48d3a8ae575a.tar.gz tigervnc-3e7ed8164f77dfdfe62d8bedd35e48d3a8ae575a.zip | |
Fix build on 32-bit and 64-bit Windows
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5051 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer')
| -rw-r--r-- | vncviewer/CConn.cxx | 2 | ||||
| -rw-r--r-- | vncviewer/CConn.h | 2 | ||||
| -rw-r--r-- | vncviewer/vncviewer.cxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx index e4d55aa0..97e35ba0 100644 --- a/vncviewer/CConn.cxx +++ b/vncviewer/CConn.cxx @@ -192,7 +192,7 @@ void CConn::blockCallback() Fl::wait((double)next_timer / 1000.0); } -void CConn::socketEvent(int fd, void *data) +void CConn::socketEvent(FL_SOCKET fd, void *data) { CConn *cc; static bool recursing = false; diff --git a/vncviewer/CConn.h b/vncviewer/CConn.h index e48b3c71..24fbbab4 100644 --- a/vncviewer/CConn.h +++ b/vncviewer/CConn.h @@ -40,7 +40,7 @@ public: void blockCallback(); // Callback when socket is ready (or broken) - static void socketEvent(int fd, void *data); + static void socketEvent(FL_SOCKET fd, void *data); // CConnection callback methods void serverInit(); diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index 6cf1d89f..37d63a6c 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -444,6 +444,7 @@ int main(int argc, char** argv) Socket *sock = NULL; +#ifndef WIN32 /* Specifying -via and -listen together is nonsense */ if (listenMode && strlen(via.getValueStr()) > 0) { vlog.error("Parameters -listen and -via are incompatible"); @@ -451,6 +452,7 @@ int main(int argc, char** argv) exit_vncviewer(); return 1; } +#endif if (listenMode) { try { |