Changeset 3909:182713540d14 in roaraudio

Timestamp:

06/06/10 13:41:24 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

only support type=socket in case we have UNIX sockets

File:

• libroar/vio_pipe.c (modified) (9 diffs)

libroar/vio_pipe.c

@@ -85 +85 @@
      }
    break;
+#ifdef ROAR_HAVE_UNIX
   case ROAR_VIO_PIPE_TYPE_SOCKET:
     if ( socketpair(AF_UNIX, SOCK_STREAM, 0, self->b.p) == -1 ) {
@@ -99 +100 @@
     }
    break;
+#endif
   default:
     roar_mm_free(self);
@@ -169 +171 @@
    }
    break;
+#ifdef ROAR_HAVE_UNIX
   case ROAR_VIO_PIPE_TYPE_SOCKET:
     close(self->b.p[idx = ROAR_VIO_PIPE_S(self, vio)]);
     self->b.p[idx] = -1;
    break;
+#endif
  }
 
@@ -198 +202 @@
     return roar_socket_nonblock(self->b.p[(ROAR_VIO_PIPE_SR(self,vio)*2)+1], state);
    break;
+#ifdef ROAR_HAVE_UNIX
   case ROAR_VIO_PIPE_TYPE_SOCKET:
     return roar_socket_nonblock(self->b.p[ROAR_VIO_PIPE_S(self,vio)], state);
    break;
+#endif
  }
 
@@ -231 +237 @@
   case ROAR_VIO_CTL_GET_FH:
   case ROAR_VIO_CTL_GET_SELECT_FH:
+#ifdef ROAR_HAVE_UNIX
     if ( self->type == ROAR_VIO_PIPE_TYPE_SOCKET ) {
      *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)];
@@ -237 +244 @@
      return -1;
     }
+#else
+    return -1;
+#endif
    break;
   case ROAR_VIO_CTL_GET_READ_FH:
   case ROAR_VIO_CTL_GET_SELECT_READ_FH:
     switch (self->type) {
+#ifdef ROAR_HAVE_UNIX
      case ROAR_VIO_PIPE_TYPE_SOCKET:
        *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)];
        return 0;
       break;
+#endif
      case ROAR_VIO_PIPE_TYPE_PIPE:
        *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)*2];
@@ -253 +265 @@
   case ROAR_VIO_CTL_GET_SELECT_WRITE_FH:
     switch (self->type) {
+#ifdef ROAR_HAVE_UNIX
      case ROAR_VIO_PIPE_TYPE_SOCKET:
        *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)];
        return 0;
       break;
+#endif
      case ROAR_VIO_PIPE_TYPE_PIPE:
        *(int*)data = self->b.p[(ROAR_VIO_PIPE_SR(self,vio)*2)+1];
@@ -299 +313 @@
     return read(self->b.p[ROAR_VIO_PIPE_S(self,vio)*2], buf, count);
    break;
+#ifdef ROAR_HAVE_UNIX
   case ROAR_VIO_PIPE_TYPE_SOCKET:
     return read(self->b.p[ROAR_VIO_PIPE_S(self,vio)], buf, count);
    break;
+#endif
  }
 
@@ -352 +368 @@
     return write(self->b.p[(ROAR_VIO_PIPE_SR(self,vio)*2)+1], buf, count);
    break;
+#ifdef ROAR_HAVE_UNIX
   case ROAR_VIO_PIPE_TYPE_SOCKET:
     return write(self->b.p[ROAR_VIO_PIPE_S(self,vio)], buf, count);
    break;
+#endif
  }