Index: sofa/src/messages.cxx
===================================================================
--- sofa/src/messages.cxx	(revision 60)
+++ sofa/src/messages.cxx	(working copy)
@@ -248,6 +248,7 @@
     }
   }
 
+#ifdef TCP_KEEPIDLE
   if (!messagesSocket.SetOption(TCP_KEEPIDLE, 10, IPPROTO_TCP)) {
     PTRACE(1, "SetOption(TCP_KEEPIDLE 2) failed: " << messagesSocket.GetErrorText());
     if (!keepGoing) {
@@ -255,7 +256,9 @@
       return;
     }
   }
+#endif
 
+#ifdef TCP_KEEPCNT
   if (!messagesSocket.SetOption(TCP_KEEPCNT, 2, IPPROTO_TCP)) {
     PTRACE(1, "SetOption(TCP_KEEPCNT 2) failed: " << messagesSocket.GetErrorText());
     if (!keepGoing) {
@@ -263,7 +266,9 @@
       return;
     }  
   }
+#endif
 
+#ifdef TCP_KEEPINTVL
   if (!messagesSocket.SetOption(TCP_KEEPINTVL, 10, IPPROTO_TCP)) {
     PTRACE(1, "SetOption(TCP_KEEPINTVL 2) failed: " << messagesSocket.GetErrorText());
     if (!keepGoing) {
@@ -271,6 +276,7 @@
       return;
     }
   }
+#endif
 
   messagesSocket.SetReadTimeout(PMaxTimeInterval);
 
@@ -312,7 +318,7 @@
   PINDEX maxm = 2000;
   PBYTEArray data(maxm);
 
-  PINDEX consecutiveReadNulls = 10;
+#define consecutiveReadNulls 10
   PINDEX readSize[consecutiveReadNulls];
   PINDEX readIndex = 0;
   PINDEX ir;