Changeset 3788:fe1762804632 in roaraudio for libroar/socket.c

Timestamp:

05/07/10 15:44:52 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fix some warnings

File:

• libroar/socket.c (modified) (5 diffs)

libroar/socket.c

@@ -59 +59 @@
  int opt = IPTOS_LOWDELAY;
 #endif
-#ifdef TCP_NODELAY
+#if defined(TCP_NODELAY) && !defined(ROAR_TARGET_WIN32)
  int t   = 1;
 #endif
@@ -70 +70 @@
  setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int));
 #endif
-#ifdef TCP_NODELAY
+#if defined(TCP_NODELAY) && !defined(ROAR_TARGET_WIN32)
  setsockopt(fh, IPPROTO_TCP, TCP_NODELAY, &t, sizeof(int));
 #endif
@@ -476 +476 @@
 #ifdef ROAR_HAVE_IPX
 #define _NEED_OBJ
- int i;
  int ret;
+#endif
+#ifdef ROAR_HAVE_IPX
+ unsigned int ipx_port;
 #endif
 #ifdef ROAR_HAVE_UNIX
@@ -503 +505 @@
 #endif
  //unsigned int host_div = 0;
+#ifdef ROAR_TARGET_WIN32
+ int PASCAL (*mode_func)(SOCKET,const struct sockaddr*,int) = connect; // default is to connect
+#else
  int (*mode_func)(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) = connect; // default is to connect
+#endif
 #ifdef ROAR_HAVE_LIBDNET
 #define _NEED_OBJ
@@ -649 +655 @@
   obj[0] = 0;
 
-  if ( (ret = sscanf(host, "%8x.%12s(%x)", &socket_addr.ipx.sipx_network, obj,
-                               (unsigned int *)&socket_addr.ipx.sipx_port)) < 2 ) {
-   return -1;
+  if ( (ret = sscanf(host, "%8x.%12s(%x)", &socket_addr.ipx.sipx_network, obj, &ipx_port)) < 2 ) {
+   return -1;
+   socket_addr.ipx.sipx_port = ipx_port;
   } else if ( ret == 2 ) {
    socket_addr.ipx.sipx_port = port; // Network Byte Order?