made it compile without warnings on Win32

diff --git a/lib/secure/src/olsrd_secure.c b/lib/secure/src/olsrd_secure.c
index 79d27c7..84ee404 100644 (file)
--- a/lib/secure/src/olsrd_secure.c
+++ b/lib/secure/src/olsrd_secure.c
@@ -33,7 +33,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: olsrd_secure.c,v 1.23 2007/04/25 22:08:07 bernd67 Exp $
+ * $Id: olsrd_secure.c,v 1.24 2007/05/09 17:29:53 bernd67 Exp $
  */
 
 
@@ -752,7 +752,7 @@ parse_cres(char *in_msg)
       return 0;
     }
 
-  olsr_printf(3, "[ENC]Challenge: 0x%x\n", ntohl(msg->challenge));
+  olsr_printf(3, "[ENC]Challenge: 0x%lx\n", ntohl(msg->challenge));
 
   /* Check signature */
 
@@ -979,7 +979,7 @@ parse_challenge(char *in_msg)
        }
     }
 
-  olsr_printf(3, "[ENC]Challenge: 0x%x\n", ntohl(msg->challenge));
+  olsr_printf(3, "[ENC]Challenge: 0x%lx\n", ntohl(msg->challenge));
 
   /* Check signature */
 

diff --git a/lib/txtinfo/src/olsrd_txtinfo.c b/lib/txtinfo/src/olsrd_txtinfo.c
index e0013e4..46bb0bb 100644 (file)
--- a/lib/txtinfo/src/olsrd_txtinfo.c
+++ b/lib/txtinfo/src/olsrd_txtinfo.c
@@ -40,7 +40,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
- * $Id: olsrd_txtinfo.c,v 1.5 2007/04/28 19:58:49 bernd67 Exp $
+ * $Id: olsrd_txtinfo.c,v 1.6 2007/05/09 17:29:53 bernd67 Exp $
  */
 
 /*
@@ -262,10 +262,10 @@ ipc_action(int fd)
       
       /* purge read buffer to prevent blocking on linux*/
       FD_ZERO(&rfds);
-      FD_SET(ipc_connection, &rfds);
+      FD_SET((unsigned int)ipc_connection, &rfds); /* Win32 needs the cast here */
       if(select(ipc_connection+1, &rfds, NULL, NULL, &tv)) {
         char requ[128];
-        ssize_t s = recv(ipc_connection, &requ, sizeof(requ), 0);
+        ssize_t s = recv(ipc_connection, (void*)&requ, sizeof(requ), 0); /* Win32 needs the cast here */
         if (0 < s) {
           requ[s] = 0;
           /* To print out neighbours only on the Freifunk Status