Changeset 5406:3a3e9d18f561 in roaraudio

Timestamp:

02/13/12 15:16:34 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Ported to Win32 (again...) (pr1)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/vio.h (modified) (1 diff)
• libroar/basic.c (modified) (1 diff)
• libroar/vio_socket.c (modified) (1 diff)

ChangeLog

@@ -10 +10 @@
         * Added VIO/DSTR for SOCKS proxy (See: #187)
         * Added support for stream direction RECPLAY.
+        * Ported to Win32 (again...) (pr1)
 
 v. 0.4 - Fri Nov 11 2011 20:12 CET

include/libroar/vio.h

@@ -49 +49 @@
 #define ROAR_VIOF_CREAT     O_CREAT
 #define ROAR_VIOF_TRUNC     O_TRUNC
+
+#ifndef ROAR_TARGET_WIN32
 #define ROAR_VIOF_NONBLOCK  O_NONBLOCK
+#else
+#define ROAR_VIOF_NONBLOCK  0
+#endif
 
 #define ROAR_VIO_FLAGS_NONE        0x00000000UL

libroar/basic.c

@@ -234 +234 @@
    if ( stat(user_sock, &sockstat) == 0 ) {
     if ( S_ISCHR(sockstat.st_mode) ) {
+#ifdef O_NOCTTY
      return open(user_sock, O_RDWR|O_NOCTTY, 0666);
+#else
+     return open(user_sock, O_RDWR, 0666);
+#endif
     }
    }

libroar/vio_socket.c

@@ -179 +179 @@
 
   if ( connect(fh, &(def->d.socket.sa.sa), len) == -1 ) {
+#ifdef EINPROGRESS
    if ( errno != EINPROGRESS ) {
+#endif
     roar_err_from_errno();
     close(fh);
     return -1;
+#ifdef EINPROGRESS
    }
+#endif
   }
  }