Changeset 5745:981cb1338653 in roaraudio

Timestamp:

11/09/12 23:32:43 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid warnings on systems with non-POSIX socket interface (I'm looking at you win32!)

Location:

libroar

Files:

• basic.c (modified) (1 diff)
• socket.c (modified) (2 diffs)
• vio_socket.c (modified) (2 diffs)

libroar/basic.c

@@ -273 +273 @@
  struct roar_libroar_config * config = roar_libroar_get_config();
 #endif
-#if defined(ROAR_HAVE_UNIX) || !defined(ROAR_TARGET_MICROCONTROLLER)
+#if defined(ROAR_HAVE_UNIX)
  char user_sock[128];
  char * roar_server;

libroar/socket.c

@@ -557 +557 @@
  char * del;
 #endif
+#ifdef ROAR_HAVE_GETADDRINFO
  int af_guessed = 0;
-#ifdef ROAR_HAVE_GETADDRINFO
  struct addrinfo hints, *res = NULL;
  char port_as_string[32];
@@ -580 +580 @@
 
  if ( type == ROAR_SOCKET_TYPE_UNKNOWN ) {
+#ifdef ROAR_HAVE_GETADDRINFO
   af_guessed = 1;
+#endif
   type = ROAR_SOCKET_TYPE_INET;
   if ( *host == '/' ) {

libroar/vio_socket.c

@@ -427 +427 @@
 #ifdef ROAR_HAVE_GETSERVBYNAME
  struct servent * serv  = NULL;
-#endif
  char           * proto = NULL;
+#endif
  int              port;
  char           * ts;
@@ -455 +455 @@
 #if defined(ROAR_HAVE_IPV6) || defined(ROAR_HAVE_IPV4)
     switch (type) {
-     case SOCK_STREAM: proto = "tcp"; break;
-     case SOCK_DGRAM:  proto = "udp"; break;
+     case SOCK_STREAM:
+#ifdef ROAR_HAVE_GETSERVBYNAME
+       proto = "tcp";
+#endif
+      break;
+     case SOCK_DGRAM:
+#ifdef ROAR_HAVE_GETSERVBYNAME
+       proto = "udp";
+#endif
+      break;
      default:
       return -1;