Changeset 5527:4d22e732b1c9 in roaraudio

Timestamp:

06/11/12 19:11:50 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some compiler warnings on win*

File:

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

libroar/socket.c

@@ -41 +41 @@
 
 static int roar_socket_open_file  (int mode, const char * host, int port);
+
+#ifdef ROAR_SUPPORT_PROXY
 static int roar_socket_open_proxy (int mode, int type, const char * host, int port, const char * proxy_type);
 
@@ -50 +52 @@
 static int roar_socket_open_http   (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
 
+#ifdef ROAR_HAVE_BIN_SS
 static int roar_socket_open_ssh    (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
+#endif
+#endif
 
 
@@ -67 +72 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBDNET
 static int roar_socket_decnet_set_timeout (int fh, time_t sec, int_least32_t usec) {
-#ifdef ROAR_HAVE_LIBDNET
  struct timeval timeout = {sec, usec};
 
  return setsockopt(fh, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout));
-#else
- return -1;
-#endif
-}
+}
+#endif
 
 static int roar_socket_set_tos(int fh) {
@@ -415 +418 @@
 
 
+#ifdef ROAR_HAVE_LIBDNET
 static int roar_socket_listen_decnet (const char * object, int num) {
-#ifdef ROAR_HAVE_LIBDNET
  int fh = roar_socket_new(ROAR_SOCKET_TYPE_DECNET);
  struct sockaddr_dn bind_sockaddr;
@@ -461 +464 @@
 
  return fh;
-#else
- roar_err_set(ROAR_ERROR_NOSYS);
- return -1;
-#endif
-}
+}
+#endif
 
 const char * roar_socket_get_local_nodename(void) {