? gst-plugins-goog.diff
? intl
? m4/.cvsignore
? m4/a52.m4
? m4/aalib.m4
? m4/as-arts.m4
? m4/as-ffmpeg.m4
? m4/as-liblame.m4
? m4/as-slurp-ffmpeg.m4
? m4/check-libheader.m4
? m4/esd.m4
? m4/freetype2.m4
? m4/gconf-2.m4
? m4/glib.m4
? m4/gst-alsa.m4
? m4/gst-artsc.m4
? m4/gst-fionread.m4
? m4/gst-ivorbis.m4
? m4/gst-matroska.m4
? m4/gst-sdl.m4
? m4/gst-shout2.m4
? m4/gst-sid.m4
? m4/gtk.m4
? m4/libfame.m4
? m4/libmikmod.m4
? m4/lrint.m4
? m4/lrintf.m4
? m4/Makefile.am
? m4/ogg.m4
? m4/README
? m4/vorbis.m4
? po/.cvsignore
? po/af.po
? po/az.po
? po/ca.po
? po/cs.po
? po/en_GB.po
? po/fr.po
? po/hu.po
? po/it.po
? po/ja.po
? po/LINGUAS
? po/Makevars
? po/nb.po
? po/nl.po
? po/or.po
? po/POTFILES.in
? po/sq.po
? po/sr.po
? po/sv.po
? po/uk.po
? po/vi.po
Index: gst/rtsp/rtspconnection.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/rtspconnection.c,v
retrieving revision 1.39
diff -u -r1.39 rtspconnection.c
--- gst/rtsp/rtspconnection.c	1 Jun 2007 13:52:17 -0000	1.39
+++ gst/rtsp/rtspconnection.c	13 Jun 2007 16:42:52 -0000
@@ -58,6 +58,7 @@
 
 #ifdef G_OS_WIN32
 #include <winsock2.h>
+#define EINPROGRESS WSAEINPROGRESS
 #else
 #include <sys/ioctl.h>
 #include <netdb.h>
@@ -121,6 +122,9 @@
 {
   gint ret;
   RTSPConnection *newconn;
+#ifdef G_OS_WIN32
+  unsigned long flags;
+#endif /* G_OS_WIN32 */
 
   g_return_val_if_fail (conn != NULL, RTSP_EINVAL);
 
@@ -131,6 +135,9 @@
   /* pipe( CONTROL_SOCKETS(newconn) ) */
   if ((ret = pipe (CONTROL_SOCKETS (newconn))) < 0)
     goto no_socket_pair;
+
+  ioctlsocket(READ_SOCKET (newconn), FIONBIO, &flags);
+  ioctlsocket(WRITE_SOCKET (newconn), FIONBIO, &flags);
 #else
   if ((ret =
           socketpair (PF_UNIX, SOCK_STREAM, 0, CONTROL_SOCKETS (newconn))) < 0)
@@ -176,6 +183,9 @@
   fd_set readfds;
   struct timeval tv, *tvp;
   gint max_fd, retval;
+#ifdef G_OS_WIN32
+  unsigned long flags;
+#endif /* G_OS_WIN32 */
 
   g_return_val_if_fail (conn != NULL, RTSP_EINVAL);
   g_return_val_if_fail (conn->url != NULL, RTSP_EINVAL);
@@ -211,7 +221,11 @@
     goto sys_error;
 
   /* set to non-blocking mode so that we can cancel the connect */
+#ifndef G_OS_WIN32
   fcntl (fd, F_SETFL, O_NONBLOCK);
+#else
+  ioctlsocket(fd, FIONBIO, &flags);
+#endif /* G_OS_WIN32 */
 
   /* we are going to connect ASYNC now */
   ret = connect (fd, (struct sockaddr *) &sa_in, sizeof (sa_in));
