Changeset 3897:7150eb408831 in roaraudio

Timestamp:

05/25/10 17:42:59 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get things to compile on µCs

Location:

libroar

Files:

• nnode.c (modified) (2 diffs)
• simple.c (modified) (1 diff)
• socket.c (modified) (4 diffs)
• vio_select.c (modified) (3 diffs)

libroar/nnode.c

@@ -143 +143 @@
 
 int roar_nnode_new_from_fh(struct roar_nnode * nnode, int fh, int remote) {
+ // TODO: fix this in a nice way
+#ifndef ROAR_TARGET_MICROCONTROLLER
  struct sockaddr_storage sa;
  socklen_t               len = sizeof(sa);
@@ -162 +164 @@
 
  return roar_nnode_new_from_sockaddr(nnode, (struct sockaddr*)&sa, len);
+#else
+ return -1;
+#endif
 }
 

libroar/simple.c

@@ -170 +170 @@
  // make valgrind happy
  memset(&socket_addr, 0, sizeof(socket_addr));
+#ifdef ROAR_HAVE_SELECT
  memset(&mes,         0, sizeof(mes));
+#endif
 
  roar_debug_warn_sysio("roar_simple_new_stream_obj", "roar_vio_simple_new_stream_obj", NULL);

libroar/socket.c

@@ -789 +789 @@
  }
 
+// TODO: fix this in a good way
+#ifndef ROAR_TARGET_MICROCONTROLLER
  if ( passwd != NULL )
   user = passwd->pw_name;
+#endif
 
  if ( user == NULL )
@@ -897 +900 @@
 
 int roar_socket_open_socks4 (int mode, int fh, char * host, int port, char * user, char * pw, char * opts) {
+#ifndef ROAR_TARGET_MICROCONTROLLER
  struct hostent     * he;
 
@@ -905 +909 @@
 
  return roar_socket_open_socks4x(mode, fh, he->h_addr, port, NULL, 0, user);
+#else
+ return -1;
+#endif
 }
 
@@ -1062 +1069 @@
 
 
+// TODO: get this more portable!
+#ifdef AF_UNIX
  if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
   return -1;
  }
+#else
+ return -1;
+#endif
 
  r = fork();

libroar/vio_select.c

@@ -37 +37 @@
 
 ssize_t roar_vio_select(struct roar_vio_select * vios, size_t len, struct roar_vio_selecttv * rtv, struct roar_vio_selectctl * ctl) {
+#ifdef ROAR_HAVE_SELECT
  struct timeval tv;
+ fd_set rfds, wfds, efds;
+#endif
  size_t i;
  int max_fh = -1;
  int ret;
- fd_set rfds, wfds, efds;
 
  ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = ?", vios, (long long unsigned int)len, rtv, ctl);
@@ -104 +106 @@
  }
 
+#ifdef ROAR_HAVE_SELECT
  // prepaer fdsets:
  FD_ZERO(&rfds);
@@ -170 +173 @@
  }
 
+#else
+ ret = -1;
+#endif
+
  ROAR_DBG("roar_vio_select(vios=%p, len=%llu, rtv=%p, ctl=%p) = %lli", vios, (long long unsigned int)len, rtv, ctl, (long long int)ret);
  return ret;