diff options
39 files changed, 40 insertions, 40 deletions
@@ -3149,10 +3149,10 @@ cc_check && _malloc=yes if test "$_malloc" = yes ; then def_malloc_h='#define HAVE_MALLOC_H 1' else - def_malloc_h='#undef HAVE_MALLOC_H' + def_malloc_h='#define HAVE_MALLOC_H 0' fi # malloc.h emits a warning in FreeBSD and OpenBSD -freebsd || openbsd || dragonfly && def_malloc_h='#undef HAVE_MALLOC_H' +freebsd || openbsd || dragonfly && def_malloc_h='#define HAVE_MALLOC_H 0' echores "$_malloc" diff --git a/cpudetect.c b/cpudetect.c index 3dd3329d7e..8d306b1c3b 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -4,7 +4,7 @@ CpuCaps gCpuCaps; -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/libaf/af.c b/libaf/af.c index 77fda8e320..7333896882 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <string.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 33eadf25b9..7f93b1a840 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 947b47bbfc..79073d03e3 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -19,7 +19,7 @@ #include "libaf/af.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 59c67b83db..f158d7eddf 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -2,7 +2,7 @@ #include "config.h" #include <stdio.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 809acce221..fd1b3c3997 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <string.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 67f6b3e7e0..3f9241766d 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -6,7 +6,7 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 2371b0fdff..632e4381a9 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -3,7 +3,7 @@ #include <string.h> #include "config.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c index b27b1a6d01..f322619104 100644 --- a/libmpcodecs/vf_boxblur.c +++ b/libmpcodecs/vf_boxblur.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c index 2afa0afc33..3ab2ab5f8f 100644 --- a/libmpcodecs/vf_delogo.c +++ b/libmpcodecs/vf_delogo.c @@ -30,7 +30,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c index 090f89674a..6899045611 100644 --- a/libmpcodecs/vf_denoise3d.c +++ b/libmpcodecs/vf_denoise3d.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index aef35ec835..5acdfb3602 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -43,7 +43,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c index 4e737d73ec..e0b6f78bb1 100644 --- a/libmpcodecs/vf_hqdn3d.c +++ b/libmpcodecs/vf_hqdn3d.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c index 63626aa469..cd6ba0490b 100644 --- a/libmpcodecs/vf_il.c +++ b/libmpcodecs/vf_il.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c index 9fa0df255b..ac51acfb3b 100644 --- a/libmpcodecs/vf_kerndeint.c +++ b/libmpcodecs/vf_kerndeint.c @@ -28,7 +28,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c index 81b70f58d7..aae4872537 100644 --- a/libmpcodecs/vf_mcdeint.c +++ b/libmpcodecs/vf_mcdeint.c @@ -65,7 +65,7 @@ Known Issues: #undef free #undef malloc -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index 4704e8fa1b..eabfd5c16a 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -28,7 +28,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_ow.c b/libmpcodecs/vf_ow.c index 8c1f8f1c48..59c4e22852 100644 --- a/libmpcodecs/vf_ow.c +++ b/libmpcodecs/vf_ow.c @@ -36,7 +36,7 @@ #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c index 8ef90d9b5a..714763c7cc 100644 --- a/libmpcodecs/vf_perspective.c +++ b/libmpcodecs/vf_perspective.c @@ -28,7 +28,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index c538ee17f4..3566853770 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -8,7 +8,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index 88b9d9261d..e986765416 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -30,7 +30,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index bbce77e5b0..8a345a9f03 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -36,7 +36,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/eval.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 676b4bf4b0..c78f8ea9ec 100644 --- a/libmpcodecs/vf_sab.c +++ b/libmpcodecs/vf_sab.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 9d6b48d5bf..b8c6c0a1b5 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <string.h> diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c index 1ca1cbac26..7003f75c95 100644 --- a/libmpcodecs/vf_smartblur.c +++ b/libmpcodecs/vf_smartblur.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index f1071bf5d6..ebce63601f 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -46,7 +46,7 @@ #undef free #undef malloc -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_swapuv.c b/libmpcodecs/vf_swapuv.c index f9a65ae6b1..db32686c40 100644 --- a/libmpcodecs/vf_swapuv.c +++ b/libmpcodecs/vf_swapuv.c @@ -27,7 +27,7 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c index d5deebfafb..fcbbbaf0f4 100644 --- a/libmpcodecs/vf_unsharp.c +++ b/libmpcodecs/vf_unsharp.c @@ -28,7 +28,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c index a5882ffeca..57186698c7 100644 --- a/libmpcodecs/vf_uspp.c +++ b/libmpcodecs/vf_uspp.c @@ -32,7 +32,7 @@ #include "libavcodec/avcodec.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index 5a36b3caea..d834784147 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -29,7 +29,7 @@ #include "mp_msg.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c index 67ccce5a94..79770f821c 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <inttypes.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 41a3d7d006..58bcc6ad76 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -3,7 +3,7 @@ #include "config.h" #include <stdio.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/libvo/sub.c b/libvo/sub.c index 196c8c9033..597c121498 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -21,7 +21,7 @@ #include <string.h> #include "config.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 46ab3468ea..c5fa8a970d 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -37,7 +37,7 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include "fastmemcpy.h" diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index d1924fe18a..f3d3ff1519 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -30,7 +30,7 @@ #include "help_mp.h" #include "gtf.h" #include <stdio.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/loader/drv.c b/loader/drv.c index b8fecf7467..e3fb4da116 100644 --- a/loader/drv.c +++ b/loader/drv.c @@ -7,7 +7,7 @@ #include "debug.h" #include <stdio.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/loader/ext.c b/loader/ext.c index 495afb9aac..0486f7c09b 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -14,7 +14,7 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <unistd.h> diff --git a/loader/win32.c b/loader/win32.c index 172a91afa9..2ee9f1ea7e 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -53,7 +53,7 @@ for DLL to know too much about its environment. #include <ctype.h> #include <pthread.h> #include <errno.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <time.h> |