From c693af1951a0074a29ce39b69736ff0cf33b41d2 Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sat, 6 Jan 2018 18:59:46 +0000
Subject: [PATCH] libavformat/network: fix function duplication
Since the function used to be exposed for ffserver's sake, it was renamed
to the same name as a system's aton function which caused a collision.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
---
libavformat/os_support.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 6bdfc040978..099d7b501f4 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -60,11 +60,6 @@ static int inet_aton(const char *str, struct in_addr *add)
return 1;
}
-#else
-static int inet_aton(const char *str, struct in_addr *add)
-{
- return inet_aton(str, add);
-}
#endif /* !HAVE_INET_ATON */
#if !HAVE_GETADDRINFO
--
GitLab