Revision: 5051 http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5051&view=rev Author: dcommander Date: 2013-02-26 10:34:22 +0000 (Tue, 26 Feb 2013) Log Message: ----------- Fix build on 32-bit and 64-bit Windows
Modified Paths: -------------- trunk/vncviewer/CConn.cxx trunk/vncviewer/CConn.h trunk/vncviewer/vncviewer.cxx Modified: trunk/vncviewer/CConn.cxx =================================================================== --- trunk/vncviewer/CConn.cxx 2013-02-22 19:47:13 UTC (rev 5050) +++ trunk/vncviewer/CConn.cxx 2013-02-26 10:34:22 UTC (rev 5051) @@ -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; Modified: trunk/vncviewer/CConn.h =================================================================== --- trunk/vncviewer/CConn.h 2013-02-22 19:47:13 UTC (rev 5050) +++ trunk/vncviewer/CConn.h 2013-02-26 10:34:22 UTC (rev 5051) @@ -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(); Modified: trunk/vncviewer/vncviewer.cxx =================================================================== --- trunk/vncviewer/vncviewer.cxx 2013-02-22 19:47:13 UTC (rev 5050) +++ trunk/vncviewer/vncviewer.cxx 2013-02-26 10:34:22 UTC (rev 5051) @@ -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 { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ Tigervnc-commits mailing list Tigervnc-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tigervnc-commits