Mercurial > mplayer.hg

changeset 28594:df67d03dde3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning: mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined
author diego
date Tue, 17 Feb 2009 11:16:19 +0000
parents 94d9e6403ee4
children b521607f0079
files configure cpudetect.c libaf/af.c libmenu/vf_menu.c libmpcodecs/dec_audio.c libmpcodecs/dec_video.c libmpcodecs/mp_image.c libmpcodecs/vd.c libmpcodecs/vf.c libmpcodecs/vf_boxblur.c libmpcodecs/vf_delogo.c libmpcodecs/vf_denoise3d.c libmpcodecs/vf_fspp.c libmpcodecs/vf_hqdn3d.c libmpcodecs/vf_il.c libmpcodecs/vf_kerndeint.c libmpcodecs/vf_mcdeint.c libmpcodecs/vf_noise.c libmpcodecs/vf_ow.c libmpcodecs/vf_perspective.c libmpcodecs/vf_pp.c libmpcodecs/vf_pp7.c libmpcodecs/vf_qp.c libmpcodecs/vf_sab.c libmpcodecs/vf_screenshot.c libmpcodecs/vf_smartblur.c libmpcodecs/vf_spp.c libmpcodecs/vf_swapuv.c libmpcodecs/vf_unsharp.c libmpcodecs/vf_uspp.c libmpcodecs/vf_yadif.c libmpdemux/parse_mp4.c libmpdemux/video.c libvo/sub.c libvo/vo_dxr3.c libvo/vo_vesa.c loader/drv.c loader/ext.c loader/win32.c
diffstat 39 files changed, 40 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Feb 17 10:41:13 2009 +0000
+++ b/configure	Tue Feb 17 11:16:19 2009 +0000
@@ -3149,10 +3149,10 @@
 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"
 
 
--- a/cpudetect.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/cpudetect.c	Tue Feb 17 11:16:19 2009 +0000
@@ -4,7 +4,7 @@
 
 CpuCaps gCpuCaps;
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #include <stdlib.h>
--- a/libaf/af.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libaf/af.c	Tue Feb 17 11:16:19 2009 +0000
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmenu/vf_menu.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmenu/vf_menu.c	Tue Feb 17 11:16:19 2009 +0000
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/dec_audio.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/dec_audio.c	Tue Feb 17 11:16:19 2009 +0000
@@ -19,7 +19,7 @@
 
 #include "libaf/af.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/dec_video.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/dec_video.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/libmpcodecs/mp_image.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/mp_image.c	Tue Feb 17 11:16:19 2009 +0000
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vd.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vd.c	Tue Feb 17 11:16:19 2009 +0000
@@ -6,7 +6,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf.c	Tue Feb 17 11:16:19 2009 +0000
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "config.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_boxblur.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_boxblur.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_delogo.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_delogo.c	Tue Feb 17 11:16:19 2009 +0000
@@ -30,7 +30,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_denoise3d.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_denoise3d.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_fspp.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_fspp.c	Tue Feb 17 11:16:19 2009 +0000
@@ -43,7 +43,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_hqdn3d.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_hqdn3d.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_il.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_il.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_kerndeint.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_kerndeint.c	Tue Feb 17 11:16:19 2009 +0000
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_mcdeint.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_mcdeint.c	Tue Feb 17 11:16:19 2009 +0000
@@ -65,7 +65,7 @@
 #undef free
 #undef malloc
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_noise.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_noise.c	Tue Feb 17 11:16:19 2009 +0000
@@ -28,7 +28,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_ow.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_ow.c	Tue Feb 17 11:16:19 2009 +0000
@@ -36,7 +36,7 @@
 
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_perspective.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_perspective.c	Tue Feb 17 11:16:19 2009 +0000
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_pp.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_pp.c	Tue Feb 17 11:16:19 2009 +0000
@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_pp7.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_pp7.c	Tue Feb 17 11:16:19 2009 +0000
@@ -30,7 +30,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_qp.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_qp.c	Tue Feb 17 11:16:19 2009 +0000
@@ -36,7 +36,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/eval.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_sab.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_sab.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_screenshot.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_screenshot.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/libmpcodecs/vf_smartblur.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_smartblur.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_spp.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_spp.c	Tue Feb 17 11:16:19 2009 +0000
@@ -46,7 +46,7 @@
 #undef free
 #undef malloc
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_swapuv.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_swapuv.c	Tue Feb 17 11:16:19 2009 +0000
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_unsharp.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_unsharp.c	Tue Feb 17 11:16:19 2009 +0000
@@ -28,7 +28,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_uspp.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_uspp.c	Tue Feb 17 11:16:19 2009 +0000
@@ -32,7 +32,7 @@
 
 #include "libavcodec/avcodec.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpcodecs/vf_yadif.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpcodecs/vf_yadif.c	Tue Feb 17 11:16:19 2009 +0000
@@ -29,7 +29,7 @@
 
 #include "mp_msg.h"
 
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libmpdemux/parse_mp4.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpdemux/parse_mp4.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/libmpdemux/video.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libmpdemux/video.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/libvo/sub.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libvo/sub.c	Tue Feb 17 11:16:19 2009 +0000
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "config.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
--- a/libvo/vo_dxr3.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libvo/vo_dxr3.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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"
--- a/libvo/vo_vesa.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/libvo/vo_vesa.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/loader/drv.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/loader/drv.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/loader/ext.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/loader/ext.c	Tue Feb 17 11:16:19 2009 +0000
@@ -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>
--- a/loader/win32.c	Tue Feb 17 10:41:13 2009 +0000
+++ b/loader/win32.c	Tue Feb 17 11:16:19 2009 +0000
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <pthread.h>
 #include <errno.h>
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #include <time.h>