[FFmpeg-devel] [PATCH] all: add _DEFAULT_SOURCE locally wherever needed

[Ganesh Ajjanagadde]

On Sat, Oct 3, 2015 at 7:47 AM, wm4 <nfxjfg at googlemail.com> wrote:
> On Sat,  3 Oct 2015 07:41:00 -0500
> Ganesh Ajjanagadde <gajjanagadde at gmail.com> wrote:
>
>> Glibc 2.20 onwards generates a deprecation warning for usage of _BSD_SOURCE and _SVID_SOURCE.
>> The solution from man feature_test_macros is to define both _DEFAULT_SOURCE and the old macros.
>> This solution is on the lines of the one in commit af1818276ef271af98e2e2bbabb4dc875b4fa7d8.
>>
>> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
>> ---
>>  libavformat/img2dec.c | 1 +
>>  libavformat/udp.c     | 1 +
>>  libswscale/utils.c    | 1 +
>>  3 files changed, 3 insertions(+)
>>
>> diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
>> index 1697579..0cbcf4a 100644
>> --- a/libavformat/img2dec.c
>> +++ b/libavformat/img2dec.c
>> @@ -20,6 +20,7 @@
>>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>>   */
>>
>> +#define _DEFAULT_SOURCE
>>  #define _BSD_SOURCE
>>  #include <sys/stat.h>
>>  #include "libavutil/avstring.h"
>> diff --git a/libavformat/udp.c b/libavformat/udp.c
>> index d40ea97..1bda5af 100644
>> --- a/libavformat/udp.c
>> +++ b/libavformat/udp.c
>> @@ -24,6 +24,7 @@
>>   * UDP protocol
>>   */
>>
>> +#define _DEFAULT_SOURCE
>>  #define _BSD_SOURCE     /* Needed for using struct ip_mreq with recent glibc */
>>
>>  #include "avformat.h"
>> diff --git a/libswscale/utils.c b/libswscale/utils.c
>> index eb1c940..651b07a 100644
>> --- a/libswscale/utils.c
>> +++ b/libswscale/utils.c
>> @@ -20,6 +20,7 @@
>>
>>  #include "config.h"
>>
>> +#define _DEFAULT_SOURCE
>>  #define _SVID_SOURCE // needed for MAP_ANONYMOUS
>>  #define _DARWIN_C_SOURCE // needed for MAP_ANON
>>  #include <inttypes.h>
>
> IMHO much better than the previous attempts, and likely minimize the
> potential for regressions.

I agree with the local idea now as well - I realized that the global
one is not really a "fire and forget"  (the only benefit I was
claiming for it).

>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel