From eaa53b957b6076ee7f598274a1498d8c7ca7130e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 15 Nov 2006 01:11:33 +0000 Subject: [PATCH] MinGW compilation fix, inet_aton and #includes depend on networking support. Originally committed as revision 7081 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/os_support.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index fc043c1411..a66c867f08 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -36,10 +36,6 @@ #endif #include -#include -#include -#include "barpainet.h" - /** * gets the current time in micro seconds. */ @@ -71,7 +67,11 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) } #endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ -#if !defined(HAVE_INET_ATON) +#if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) +#include +#include +#include "barpainet.h" + int inet_aton (const char * str, struct in_addr * add) { const char * pch = str; @@ -93,4 +93,4 @@ done: return 1; } -#endif /* !defined HAVE_INET_ATON */ +#endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */