Import Upstream version 1.9.0-wip.20070910

libg15daemon_client/g15daemon_net.c

@@ -17,7 +17,7 @@
     
     (c) 2006 Mike Lampard, Philip Lawatsch, and others
     
-    $Revision: 244 $ -  $Date: 2007-01-05 08:04:05 +1030 (Fri, 05 Jan 2007) $ $Author: mlampard $
+    $Revision: 301 $ -  $Date: 2007-09-10 09:55:15 +0200 (Mon, 10 Sep 2007) $ $Author: mlampard $
     
     This daemon listens on localhost port 15550 for client connections,
     and arbitrates LCD display.  Allows for multiple simultaneous clients.
@@ -39,6 +39,10 @@
 #include <libg15.h>
 #include "g15daemon_client.h" 
 
+#ifndef SO_PRIORITY
+#define SO_PRIORITY 12
+#endif
+
 #define G15SERVER_PORT 15550
 #define G15SERVER_ADDR "127.0.0.1"
 int leaving = 0;
@@ -217,7 +221,7 @@ int g15_send_cmd (int sock, unsigned char command, unsigned char value)
             retval = 0;
             packet[0] = (unsigned char)command;
             send( sock, packet, 1, MSG_OOB );
-            recv(sock, &retval, sizeof(retval),0);
+            g15_recv(sock, (char*)&retval, sizeof(retval));
             break;
         }
         case G15DAEMON_IS_FOREGROUND:{