[MPlayer-cvslog] r28629 - in trunk: 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...
diego
subversion at mplayerhq.hu
Tue Feb 17 12:16:20 CET 2009
Author: diego
Date: Tue Feb 17 12:16:19 2009
New Revision: 28629
Log:
Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined
Modified:
trunk/configure
trunk/cpudetect.c
trunk/libaf/af.c
trunk/libmenu/vf_menu.c
trunk/libmpcodecs/dec_audio.c
trunk/libmpcodecs/dec_video.c
trunk/libmpcodecs/mp_image.c
trunk/libmpcodecs/vd.c
trunk/libmpcodecs/vf.c
trunk/libmpcodecs/vf_boxblur.c
trunk/libmpcodecs/vf_delogo.c
trunk/libmpcodecs/vf_denoise3d.c
trunk/libmpcodecs/vf_fspp.c
trunk/libmpcodecs/vf_hqdn3d.c
trunk/libmpcodecs/vf_il.c
trunk/libmpcodecs/vf_kerndeint.c
trunk/libmpcodecs/vf_mcdeint.c
trunk/libmpcodecs/vf_noise.c
trunk/libmpcodecs/vf_ow.c
trunk/libmpcodecs/vf_perspective.c
trunk/libmpcodecs/vf_pp.c
trunk/libmpcodecs/vf_pp7.c
trunk/libmpcodecs/vf_qp.c
trunk/libmpcodecs/vf_sab.c
trunk/libmpcodecs/vf_screenshot.c
trunk/libmpcodecs/vf_smartblur.c
trunk/libmpcodecs/vf_spp.c
trunk/libmpcodecs/vf_swapuv.c
trunk/libmpcodecs/vf_unsharp.c
trunk/libmpcodecs/vf_uspp.c
trunk/libmpcodecs/vf_yadif.c
trunk/libmpdemux/parse_mp4.c
trunk/libmpdemux/video.c
trunk/libvo/sub.c
trunk/libvo/vo_dxr3.c
trunk/libvo/vo_vesa.c
trunk/loader/drv.c
trunk/loader/ext.c
trunk/loader/win32.c
Modified: trunk/configure
==============================================================================
--- trunk/configure Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/configure Tue Feb 17 12:16:19 2009 (r28629)
@@ -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"
Modified: trunk/cpudetect.c
==============================================================================
--- trunk/cpudetect.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/cpudetect.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -4,7 +4,7 @@
CpuCaps gCpuCaps;
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#include <stdlib.h>
Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libaf/af.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmenu/vf_menu.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/dec_audio.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -19,7 +19,7 @@
#include "libaf/af.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/dec_video.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/libmpcodecs/mp_image.c
==============================================================================
--- trunk/libmpcodecs/mp_image.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/mp_image.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vd.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -6,7 +6,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -3,7 +3,7 @@
#include <string.h>
#include "config.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_boxblur.c
==============================================================================
--- trunk/libmpcodecs/vf_boxblur.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_boxblur.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_delogo.c
==============================================================================
--- trunk/libmpcodecs/vf_delogo.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_delogo.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -30,7 +30,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_denoise3d.c
==============================================================================
--- trunk/libmpcodecs/vf_denoise3d.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_denoise3d.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_fspp.c
==============================================================================
--- trunk/libmpcodecs/vf_fspp.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_fspp.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -43,7 +43,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_hqdn3d.c
==============================================================================
--- trunk/libmpcodecs/vf_hqdn3d.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_hqdn3d.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_il.c
==============================================================================
--- trunk/libmpcodecs/vf_il.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_il.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_kerndeint.c
==============================================================================
--- trunk/libmpcodecs/vf_kerndeint.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_kerndeint.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -28,7 +28,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_mcdeint.c
==============================================================================
--- trunk/libmpcodecs/vf_mcdeint.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_mcdeint.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -65,7 +65,7 @@ Known Issues:
#undef free
#undef malloc
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_noise.c
==============================================================================
--- trunk/libmpcodecs/vf_noise.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_noise.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -28,7 +28,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_ow.c
==============================================================================
--- trunk/libmpcodecs/vf_ow.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_ow.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -36,7 +36,7 @@
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_perspective.c
==============================================================================
--- trunk/libmpcodecs/vf_perspective.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_perspective.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -28,7 +28,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_pp.c
==============================================================================
--- trunk/libmpcodecs/vf_pp.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_pp.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -8,7 +8,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_pp7.c
==============================================================================
--- trunk/libmpcodecs/vf_pp7.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_pp7.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -30,7 +30,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_qp.c
==============================================================================
--- trunk/libmpcodecs/vf_qp.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_qp.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -36,7 +36,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/eval.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_sab.c
==============================================================================
--- trunk/libmpcodecs/vf_sab.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_sab.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_screenshot.c
==============================================================================
--- trunk/libmpcodecs/vf_screenshot.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_screenshot.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/libmpcodecs/vf_smartblur.c
==============================================================================
--- trunk/libmpcodecs/vf_smartblur.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_smartblur.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_spp.c
==============================================================================
--- trunk/libmpcodecs/vf_spp.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_spp.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -46,7 +46,7 @@
#undef free
#undef malloc
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_swapuv.c
==============================================================================
--- trunk/libmpcodecs/vf_swapuv.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_swapuv.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -27,7 +27,7 @@
#include "config.h"
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_unsharp.c
==============================================================================
--- trunk/libmpcodecs/vf_unsharp.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_unsharp.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -28,7 +28,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_uspp.c
==============================================================================
--- trunk/libmpcodecs/vf_uspp.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_uspp.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -32,7 +32,7 @@
#include "libavcodec/avcodec.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpcodecs/vf_yadif.c
==============================================================================
--- trunk/libmpcodecs/vf_yadif.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpcodecs/vf_yadif.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -29,7 +29,7 @@
#include "mp_msg.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libmpdemux/parse_mp4.c
==============================================================================
--- trunk/libmpdemux/parse_mp4.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpdemux/parse_mp4.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libmpdemux/video.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libvo/sub.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -21,7 +21,7 @@
#include <string.h>
#include "config.h"
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libvo/vo_dxr3.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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"
Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/libvo/vo_vesa.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/loader/drv.c
==============================================================================
--- trunk/loader/drv.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/loader/drv.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/loader/ext.c
==============================================================================
--- trunk/loader/ext.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/loader/ext.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -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>
Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c Tue Feb 17 11:41:13 2009 (r28628)
+++ trunk/loader/win32.c Tue Feb 17 12:16:19 2009 (r28629)
@@ -53,7 +53,7 @@ for DLL to know too much about its envir
#include <ctype.h>
#include <pthread.h>
#include <errno.h>
-#ifdef HAVE_MALLOC_H
+#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#include <time.h>
More information about the MPlayer-cvslog
mailing list