Commit eaa53b95 authored by Diego Biurrun's avatar Diego Biurrun

MinGW compilation fix, inet_aton and #includes depend on networking support.

Originally committed as revision 7081 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bedb3550
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
#endif #endif
#include <time.h> #include <time.h>
#include <stdlib.h>
#include <strings.h>
#include "barpainet.h"
/** /**
* gets the current time in micro seconds. * gets the current time in micro seconds.
*/ */
...@@ -71,7 +67,11 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) ...@@ -71,7 +67,11 @@ struct tm *localtime_r(const time_t *t, struct tm *tp)
} }
#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ #endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */
#if !defined(HAVE_INET_ATON) #if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK)
#include <stdlib.h>
#include <strings.h>
#include "barpainet.h"
int inet_aton (const char * str, struct in_addr * add) int inet_aton (const char * str, struct in_addr * add)
{ {
const char * pch = str; const char * pch = str;
...@@ -93,4 +93,4 @@ done: ...@@ -93,4 +93,4 @@ done:
return 1; return 1;
} }
#endif /* !defined HAVE_INET_ATON */ #endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment