@@ -18,10 +18,11 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#include "libavutil/avutil.h"

+#include <fcntl.h>

 #include "network.h"

 #include "url.h"

 #include "libavcodec/internal.h"

+#include "libavutil/avutil.h"

 #include "libavutil/mem.h"

 #include "url.h"

 #include "libavutil/time.h"

@@ -235,6 +236,24 @@ static int ff_poll_interrupt(struct pollfd *p, nfds_t nfds, int timeout,

     return ret;

 }

+int ff_socket(int af, int type, int proto)

+{

+    int fd;

+

+#ifdef SOCK_CLOEXEC

+    fd = socket(af, type | SOCK_CLOEXEC, proto);

+    if (fd == -1 && errno == EINVAL)

+#endif

+    {

+        fd = socket(af, type, proto);

+#if HAVE_FCNTL

+        if (fd != -1)

+            fcntl(fd, F_SETFD, FD_CLOEXEC);

+#endif

+    }

+    return fd;

+}

+

 int ff_listen_bind(int fd, const struct sockaddr *addr,

                    socklen_t addrlen, int timeout, URLContext *h)

 {

@@ -262,13 +262,6 @@ int ff_listen_connect(int fd, const struct sockaddr *addr,

 int ff_http_match_no_proxy(const char *no_proxy, const char *hostname);

-#ifndef SOCK_CLOEXEC

-#define SOCK_CLOEXEC 0

-#endif

-

-static inline int ff_socket(int domain, int type, int protocol)

-{

-    return socket(domain, type | SOCK_CLOEXEC, protocol);

-}

+int ff_socket(int domain, int type, int protocol);

 #endif /* AVFORMAT_NETWORK_H */