Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

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

Browse source 
Originally committed as revision 7081 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-11-15 01:11:33 +00:00
parent bedb355098
commit eaa53b957b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libavformat/os_support.c
View file

@ -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)
} }
#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:
return 1; return 1;
} }
#endif /* !defined HAVE_INET_ATON */ #endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */