diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:18:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:18:18 +0200 |
| commit | 296eaa84b9d0659b48014917f99032b3fa725302 (patch) | |
| tree | 5646cfaf430551b321c83e301cb69dbf76638cdb /libavformat/network.h | |
| parent | 69f543854deb8c31183b20ca72e10e78d3296f53 (diff) | |
| parent | 9d5ec50ead97e088d77317e77b18cef06cb3d053 (diff) | |
| download | ffmpeg-296eaa84b9d0659b48014917f99032b3fa725302.tar.gz | |
Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'
* commit '9d5ec50ead97e088d77317e77b18cef06cb3d053':
ff_socket: put out-of-line and fallback to fcntl() for close-on-exec
Conflicts:
libavformat/network.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 4b5398a12c..c60e1424a1 100644 --- a/libavformat/network.h +++ b/libavformat/network.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 */ |