| Message ID | 1503604953-62888-1-git-send-email-derek.buitenhuis@gmail.com |
|---|---|
| State | Accepted |
| Commit | 5e3f6dc70198426fe0741e3017826b8bf3ee5ad8 |
| Headers | show |
On 8/24/2017 9:02 PM, Derek Buitenhuis wrote: > Fixes: > > libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] > #if USE_MMAP > ^ > libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP' > #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) > ^ > Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> > --- > libswscale/utils.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) s#utils#swscale/utils# - Derek
On Thu, Aug 24, 2017 at 09:02:33PM +0100, Derek Buitenhuis wrote: > Fixes: > > libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] > #if USE_MMAP > ^ > libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP' > #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) > ^ > Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> > --- > libswscale/utils.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) should be ok [...]
diff --git a/libswscale/utils.c b/libswscale/utils.c index b75510d..dcab707 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1574,7 +1574,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, } } -#define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) +#if HAVE_MMAP && HAVE_MPROTECT && defined(MAP_ANONYMOUS) +#define USE_MMAP 1 +#else +#define USE_MMAP 0 +#endif /* precalculate horizontal scaler filter coefficients */ {
Fixes: libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] #if USE_MMAP ^ libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP' #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) ^ Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> --- libswscale/utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)