summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2007-02-22 13:34:36 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2007-02-22 13:34:36 +0000
commitb5cccea088d6b9a2c24bafd9ba4d8289076a3084 (patch)
treee3abaab388108f803b13346a38c97473985ac771
parent5400e0923ab989a1bf377f1aa48c0f1ed6c3ac91 (diff)
change PF_INET to AF_INET to be consistent in the whole project. PF_INET is deprecated, while AF_INET is referred by the POSIX standards
Originally committed as revision 8073 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/barpainet.h1
-rw-r--r--libavformat/tcp.c2
-rw-r--r--libavformat/udp.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/barpainet.h b/libavformat/barpainet.h
index b50bf82b6e..c79855c2f7 100644
--- a/libavformat/barpainet.h
+++ b/libavformat/barpainet.h
@@ -27,7 +27,6 @@
# include <socket.h>
int inet_aton (const char * str, struct in_addr * add);
-# define PF_INET AF_INET
# define SO_SNDBUF 0x40000001
/* fake */
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index fa9e13587f..a5539be4c4 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -73,7 +73,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
if (resolve_host(&dest_addr.sin_addr, hostname) < 0)
goto fail;
- fd = socket(PF_INET, SOCK_STREAM, 0);
+ fd = socket(AF_INET, SOCK_STREAM, 0);
if (fd < 0)
goto fail;
fcntl(fd, F_SETFL, O_NONBLOCK);
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 46edd0f902..bbf8ca2ec6 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -330,7 +330,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
}
#ifndef CONFIG_IPV6
- udp_fd = socket(PF_INET, SOCK_DGRAM, 0);
+ udp_fd = socket(AF_INET, SOCK_DGRAM, 0);
if (udp_fd < 0)
goto fail;