diff options
author | wm4 <wm4@nowhere> | 2012-07-30 21:19:44 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-07-30 22:14:33 +0200 |
commit | 6e8633c734d9ed273f84c6ed0a15f53c66fe98fc (patch) | |
tree | b070c03dece00af40bf2c47af1aaac1bff3ef6c5 | |
parent | 261243496ef7a7e90c921f868411ddf8c71c1d83 (diff) | |
download | mpv-6e8633c734d9ed273f84c6ed0a15f53c66fe98fc.tar.bz2 mpv-6e8633c734d9ed273f84c6ed0a15f53c66fe98fc.tar.xz |
configure: remove checks for malloc.h and alloca()
Including <malloc.h>, especially if all you want is malloc(), has no
legitimate uses (on sane platforms at least). Remove the check for it,
and remove all uses in the code.
Remove unused check for alloca().
-rwxr-xr-x | configure | 29 | ||||
-rw-r--r-- | libmpcodecs/vd_dmo.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_noise.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_perspective.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_pp.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_pp7.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_sab.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_unsharp.c | 4 | ||||
-rw-r--r-- | libmpdemux/video.c | 3 | ||||
-rw-r--r-- | sub/sub.c | 3 |
11 files changed, 0 insertions, 65 deletions
@@ -1713,29 +1713,6 @@ if test "$_inttypes" = no ; then fi -echocheck "malloc.h" -_malloc=no -header_check malloc.h && _malloc=yes -if test "$_malloc" = yes ; then - def_malloc_h='#define HAVE_MALLOC_H 1' -else - def_malloc_h='#define HAVE_MALLOC_H 0' -fi -echores "$_malloc" - - - -echocheck "alloca.h" -_alloca=no -statement_check alloca.h 'alloca(0)' && _alloca=yes -if cc_check ; then - def_alloca_h='#define HAVE_ALLOCA_H 1' -else - def_alloca_h='#undef HAVE_ALLOCA_H' -fi -echores "$_alloca" - - echocheck "mman.h" _mman=no statement_check sys/mman.h 'mmap(0, 0, 0, 0, 0, 0)' && _mman=yes @@ -3074,10 +3051,6 @@ fi echores "$_openal" echocheck "ALSA audio" -if test "$_alloca" != yes ; then - _alsa=no - res_comment="alloca missing" -fi if test "$_alsa" = auto ; then _alsa=no if pkg_config_add "alsa >= 1.0.9" ; then @@ -4346,8 +4319,6 @@ $def_dvdcss /* system headers */ -$def_alloca_h -$def_malloc_h $def_mman_h $def_mman_has_map_failed $def_soundcard_h diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c index 31d9f1e351..e300edd371 100644 --- a/libmpcodecs/vd_dmo.c +++ b/libmpcodecs/vd_dmo.c @@ -18,9 +18,6 @@ #include "config.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 10e6f4d177..0bfd94edd4 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -23,9 +23,6 @@ #include <endian.h> #include "config.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include "mp_msg.h" #include "m_option.h" diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index f8d4c2e6a3..c623e11562 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -28,10 +28,6 @@ #include "mp_msg.h" #include "cpudetect.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "img_format.h" #include "mp_image.h" #include "vf.h" diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c index b835e6b1cb..df196bb1c9 100644 --- a/libmpcodecs/vf_perspective.c +++ b/libmpcodecs/vf_perspective.c @@ -28,10 +28,6 @@ #include "config.h" #include "mp_msg.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "libavutil/mem.h" #include "img_format.h" diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index ae055f8069..9647032002 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -26,10 +26,6 @@ #include "mp_msg.h" #include "cpudetect.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "img_format.h" #include "mp_image.h" #include "vf.h" diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index 1c0274d24f..0a30022576 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -30,10 +30,6 @@ #include "mp_msg.h" #include "cpudetect.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "libavutil/mem.h" #include "img_format.h" diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 6610ea1565..1a4d87c338 100644 --- a/libmpcodecs/vf_sab.c +++ b/libmpcodecs/vf_sab.c @@ -27,10 +27,6 @@ #include "config.h" #include "mp_msg.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "libavutil/avutil.h" #include "img_format.h" #include "mp_image.h" diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c index 9014a2b6e3..864c99862a 100644 --- a/libmpcodecs/vf_unsharp.c +++ b/libmpcodecs/vf_unsharp.c @@ -28,10 +28,6 @@ #include "mp_msg.h" #include "cpudetect.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "img_format.h" #include "mp_image.h" #include "vf.h" diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 7bb1ade6e0..7daef29360 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -21,9 +21,6 @@ #include "config.h" #include <stdio.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -24,9 +24,6 @@ #include <libavutil/common.h> #include "config.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include "stream/stream.h" #include "stream/stream_dvdnav.h" |