| Message ID | 1480364574-8152-1-git-send-email-gregory.wolfe@kodakalaris.com |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Nov 28, 2016 at 1:22 PM, Gregory J. Wolfe <gregory.wolfe@kodakalaris.com> wrote: > Fate failed to build in the MinGW/Windows environment because > macro ETIMEDOUT was undefined. When this condition is detected, > the code now includes <_ptw32.h>, which defines the symbol. > > Signed-off-by: Gregory J. Wolfe <gregory.wolfe@kodakalaris.com> > --- > libavformat/tests/fifo_muxer.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c > index 9659198..b579e48 100644 > --- a/libavformat/tests/fifo_muxer.c > +++ b/libavformat/tests/fifo_muxer.c > @@ -25,6 +25,9 @@ > #include "libavutil/avassert.h" > #include "libavformat/avformat.h" > #include "libavformat/url.h" > +#ifndef ETIMEDOUT > +#include <_ptw32.h> > +#endif Should this maybe be including libavformat/network.h, which already has a workaround using the winsock definitions? My local MinGW-w64 installation doesn't have a _ptw32.h file. Thanks, -- Daniel
> -----Original Message----- > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On > Behalf Of Daniel Verkamp > Sent: Monday, November 28, 2016 7:51 PM > To: FFmpeg development discussions and patches <ffmpeg- > devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] Define ETIMEDOUT in > fifo_muxer.c for MinGW/Windows fate build. > > On Mon, Nov 28, 2016 at 1:22 PM, Gregory J. Wolfe > <gregory.wolfe@kodakalaris.com> wrote: > > Fate failed to build in the MinGW/Windows environment because > > macro ETIMEDOUT was undefined. When this condition is detected, > > the code now includes <_ptw32.h>, which defines the symbol. > > > > Signed-off-by: Gregory J. Wolfe <gregory.wolfe@kodakalaris.com> > > --- > > libavformat/tests/fifo_muxer.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/libavformat/tests/fifo_muxer.c > b/libavformat/tests/fifo_muxer.c > > index 9659198..b579e48 100644 > > --- a/libavformat/tests/fifo_muxer.c > > +++ b/libavformat/tests/fifo_muxer.c > > @@ -25,6 +25,9 @@ > > #include "libavutil/avassert.h" > > #include "libavformat/avformat.h" > > #include "libavformat/url.h" > > +#ifndef ETIMEDOUT > > +#include <_ptw32.h> > > +#endif > > Should this maybe be including libavformat/network.h, which already > has a workaround using the winsock definitions? > Borrowed code from network.h to get the same result. Will submit a new patch to replace the original one. Please retest with your MinGW-w64 installation. > My local MinGW-w64 installation doesn't have a _ptw32.h file. > > Thanks, > -- Daniel
diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c index 9659198..b579e48 100644 --- a/libavformat/tests/fifo_muxer.c +++ b/libavformat/tests/fifo_muxer.c @@ -25,6 +25,9 @@ #include "libavutil/avassert.h" #include "libavformat/avformat.h" #include "libavformat/url.h" +#ifndef ETIMEDOUT +#include <_ptw32.h> +#endif #define MAX_TST_PACKETS 128 #define SLEEPTIME_50_MS 50000
Fate failed to build in the MinGW/Windows environment because macro ETIMEDOUT was undefined. When this condition is detected, the code now includes <_ptw32.h>, which defines the symbol. Signed-off-by: Gregory J. Wolfe <gregory.wolfe@kodakalaris.com> --- libavformat/tests/fifo_muxer.c | 3 +++ 1 file changed, 3 insertions(+)