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
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index e4d55aa..97e35ba 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -192,7 +192,7 @@
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 e48b3c7..24fbbab 100644
--- a/vncviewer/CConn.h
+++ b/vncviewer/CConn.h
@@ -40,7 +40,7 @@
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 6cf1d89..37d63a6 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -444,6 +444,7 @@
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 @@
exit_vncviewer();
return 1;
}
+#endif
if (listenMode) {
try {