On 11/30/2016 7:02 PM, Gregory J. Wolfe wrote: > Fate failed to build in the MinGW/Windows environment because > macro ETIMEDOUT was undefined. When this condition is detected, > the code now defines this symbol the same way it's done in > libavformat/network.h. > > Signed-off-by: Gregory J. Wolfe <gregory.wo...@kodakalaris.com> > --- > libavformat/tests/fifo_muxer.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c > index 9659198..97f798f 100644 > --- a/libavformat/tests/fifo_muxer.c > +++ b/libavformat/tests/fifo_muxer.c > @@ -25,6 +25,18 @@ > #include "libavutil/avassert.h" > #include "libavformat/avformat.h" > #include "libavformat/url.h" > +#ifndef ETIMEDOUT > +#if HAVE_WINSOCK2_H > +#include <winsock2.h> > +#include <ws2tcpip.h> > +#define ETIMEDOUT WSAETIMEDOUT
Why are you duplicating this code instead of simply including network.h? > +#else /* HAVE_WINSOCK2_H */ > +#include <sys/types.h> > +#include <sys/socket.h> > +#include <netinet/in.h> > +#include <netdb.h> > +#endif /* HAVE_WINSOCK2_H */ > +#endif /* ifndef ETIMEDOUT */ > > #define MAX_TST_PACKETS 128 > #define SLEEPTIME_50_MS 50000 > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
