Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
# include <search.h>
#endif
# include <search.h>
#endif
-#ifndef WIN32
-# include <vlc_fs.h>
-# include <unistd.h>
-#else
+#ifdef __OS2__
+# include <sys/socket.h>
+# include <netinet/in.h>
+
+typedef struct sockaddr_in SOCKADDR_IN;
+typedef struct sockaddr *PSOCKADDR;
+
+# define closesocket soclose
+#elif defined(WIN32)
# include <io.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# include <io.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# define write( a, b, c ) send (a, b, c, 0)
# undef close
# define close( a ) closesocket (a)
# define write( a, b, c ) send (a, b, c, 0)
# undef close
# define close( a ) closesocket (a)
+#else
+# include <vlc_fs.h>
+# include <unistd.h>
#endif
#include <limits.h>
#endif
#include <limits.h>
+#if defined(WIN32) || defined(__OS2__)
/**
* select()-able pipes emulated using Winsock
*/
/**
* select()-able pipes emulated using Winsock
*/
SOCKADDR_IN addr;
int addrlen = sizeof (addr);
SOCKADDR_IN addr;
int addrlen = sizeof (addr);
- SOCKET l = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP), a,
- c = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if ((l == INVALID_SOCKET) || (c == INVALID_SOCKET))
+ int l = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP), a,
+ c = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if ((l == -1) || (c == -1))
goto error;
memset (&addr, 0, sizeof (addr));
goto error;
memset (&addr, 0, sizeof (addr));
goto error;
a = accept (l, NULL, NULL);
goto error;
a = accept (l, NULL, NULL);
- if (a == INVALID_SOCKET)
goto error;
closesocket (l);
goto error;
closesocket (l);
- if (l != INVALID_SOCKET)
- if (c != INVALID_SOCKET)
closesocket (c);
return -1;
}
closesocket (c);
return -1;
}
+#endif /* WIN32 || __OS2__ */
static vlc_mutex_t pipe_lock = VLC_STATIC_MUTEX;
static vlc_mutex_t pipe_lock = VLC_STATIC_MUTEX;