git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5051 3789f03b-4d11-0410-bbf8-ca57d06f2519tags/v1.2.90
@@ -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; |
@@ -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(); |
@@ -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 { |