2 files changed, 7 insertions, 0 deletions

diff --git a/rfb/rfb.h b/rfb/rfb.h
index b28a863..a03ab21 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -44,6 +44,7 @@ extern "C"
 #endif
 
 #ifdef __MINGW32__
+#undef SOCKET
 #include <winsock2.h>
 #endif
 
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index 6d38c8f..8d6a184 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -141,6 +141,7 @@ typedef rfbBool (*HandleCursorPosProc)(struct _rfbClient* client, int x, int y);
 typedef void (*SoftCursorLockAreaProc)(struct _rfbClient* client, int x, int y, int w, int h);
 typedef void (*SoftCursorUnlockScreenProc)(struct _rfbClient* client);
 typedef void (*GotFrameBufferUpdateProc)(struct _rfbClient* client, int x, int y, int w, int h);
+typedef void (*FinishedFrameBufferUpdateProc)(struct _rfbClient* client);
 typedef char* (*GetPasswordProc)(struct _rfbClient* client);
 typedef rfbCredential* (*GetCredentialProc)(struct _rfbClient* client, int credentialType);
 typedef rfbBool (*MallocFrameBufferProc)(struct _rfbClient* client);
@@ -185,6 +186,9 @@ typedef struct _rfbClient {
 	rfbPixelFormat format;
 	rfbServerInitMsg si;
 
+	/* listen.c */
+        int listenSock;
+
 	/* sockets.c */
 #define RFB_BUF_SIZE 8192
 	char buf[RFB_BUF_SIZE];
@@ -263,6 +267,7 @@ typedef struct _rfbClient {
 	SoftCursorLockAreaProc SoftCursorLockArea;
 	SoftCursorUnlockScreenProc SoftCursorUnlockScreen;
 	GotFrameBufferUpdateProc GotFrameBufferUpdate;
+	FinishedFrameBufferUpdateProc FinishedFrameBufferUpdate;
 	/* the pointer returned by GetPassword will be freed after use! */
 	GetPasswordProc GetPassword;
 	MallocFrameBufferProc MallocFrameBuffer;
@@ -309,6 +314,7 @@ extern rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width
 /* listen.c */
 
 extern void listenForIncomingConnections(rfbClient* viewer);
+extern rfbBool listenForIncomingConnectionsNoFork(rfbClient* viewer, int usec_timeout);
 
 /* rfbproto.c */