[vlc-commits] include: remove <vlc_memory.h>
Rémi Denis-Courmont
git at videolan.org
Sun Feb 11 20:38:48 CET 2018
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 11 21:37:10 2018 +0200| [0d6cb7a6020035a506511ff4213e068b9738a45e] | committer: Rémi Denis-Courmont
include: remove <vlc_memory.h>
This only ever contained a single helper function.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d6cb7a6020035a506511ff4213e068b9738a45e
---
include/vlc_memory.h | 41 ------------------------
modules/access/rtsp/real.c | 1 -
modules/audio_output/audiounit_ios.m | 1 -
modules/audio_output/directsound.c | 1 -
modules/codec/omxil/mediacodec.c | 1 -
modules/codec/stl.c | 1 -
modules/demux/avi/avi.c | 1 -
modules/demux/mpeg/ps.h | 1 -
modules/demux/subtitle.c | 1 -
modules/demux/ttml.c | 1 -
modules/keystore/file.c | 1 -
modules/keystore/file_crypt_android.c | 1 -
modules/keystore/memory.c | 1 -
modules/misc/webservices/acoustid.c | 1 -
modules/spu/dynamicoverlay/dynamicoverlay_list.c | 1 -
modules/video_filter/gaussianblur.c | 1 -
modules/video_output/opengl/converter_sw.c | 1 -
modules/video_output/opengl/vout_helper.c | 1 -
src/Makefile.am | 1 -
src/input/stream.c | 1 -
src/modules/entry.c | 1 -
21 files changed, 61 deletions(-)
diff --git a/include/vlc_memory.h b/include/vlc_memory.h
deleted file mode 100644
index c53707e31b..0000000000
--- a/include/vlc_memory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * vlc_memory.h: Memory functions
- *****************************************************************************
- * Copyright (C) 2009 VLC authors and VideoLAN
- *
- * Authors: JP Dinger <jpd at videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef VLC_MEMORY_H
-#define VLC_MEMORY_H 1
-
-#include <stdlib.h>
-
-/**
- * \defgroup memory Memory
- * @{
- * \file
- * Memory fixups
- */
-
-
-
-/**
- * @}
- */
-
-#endif
diff --git a/modules/access/rtsp/real.c b/modules/access/rtsp/real.c
index f6091530aa..0d7742c327 100644
--- a/modules/access/rtsp/real.c
+++ b/modules/access/rtsp/real.c
@@ -28,7 +28,6 @@
#endif
#include <vlc_common.h>
-#include <vlc_memory.h>
#include <vlc_access.h>
#include <vlc_messages.h>
diff --git a/modules/audio_output/audiounit_ios.m b/modules/audio_output/audiounit_ios.m
index 83117996ea..6a8235c631 100644
--- a/modules/audio_output/audiounit_ios.m
+++ b/modules/audio_output/audiounit_ios.m
@@ -25,7 +25,6 @@
#import "coreaudio_common.h"
#import <vlc_plugin.h>
-#import <vlc_memory.h>
#import <CoreAudio/CoreAudioTypes.h>
#import <Foundation/Foundation.h>
diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c
index a38035121f..c3fa40b479 100644
--- a/modules/audio_output/directsound.c
+++ b/modules/audio_output/directsound.c
@@ -36,7 +36,6 @@
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_charset.h>
-#include <vlc_memory.h>
#include "audio_output/windows_audio_common.h"
#include "audio_output/mmdevice.h"
diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index cb6a72868c..717fce7f0c 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -35,7 +35,6 @@
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_block_helper.h>
-#include <vlc_memory.h>
#include <vlc_timestamp_helper.h>
#include <vlc_threads.h>
#include <vlc_bits.h>
diff --git a/modules/codec/stl.c b/modules/codec/stl.c
index 9c6ddc9663..d97667c169 100644
--- a/modules/codec/stl.c
+++ b/modules/codec/stl.c
@@ -32,7 +32,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_memory.h>
#include <vlc_charset.h>
#include "substext.h" /* required for font scaling / updater */
diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index f0dd7dca32..1549fe4ff4 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -42,7 +42,6 @@
#include <vlc_meta.h>
#include <vlc_codecs.h>
#include <vlc_charset.h>
-#include <vlc_memory.h>
#include "libavi.h"
#include "../rawdv.h"
diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 6d3d5c4662..aa107a093f 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -23,7 +23,6 @@
#include <assert.h>
#include <vlc_demux.h>
-#include <vlc_memory.h>
#include "timestamps.h"
#define PS_STREAM_ID_END_STREAM 0xB9
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 3d7f2faf8a..7ef52f3939 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -34,7 +34,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
-#include <vlc_memory.h>
#include <ctype.h>
#include <math.h>
diff --git a/modules/demux/ttml.c b/modules/demux/ttml.c
index ce6f499efb..88dbff268c 100644
--- a/modules/demux/ttml.c
+++ b/modules/demux/ttml.c
@@ -29,7 +29,6 @@
#include <vlc_demux.h>
#include <vlc_xml.h>
#include <vlc_strings.h>
-#include <vlc_memory.h>
#include <vlc_memstream.h>
#include <vlc_es_out.h>
#include <vlc_charset.h> /* FromCharset */
diff --git a/modules/keystore/file.c b/modules/keystore/file.c
index d3e2fcc49e..4c014831ad 100644
--- a/modules/keystore/file.c
+++ b/modules/keystore/file.c
@@ -34,7 +34,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_fs.h>
-#include <vlc_memory.h>
#include <vlc_keystore.h>
#include <vlc_strings.h>
diff --git a/modules/keystore/file_crypt_android.c b/modules/keystore/file_crypt_android.c
index 14638459e0..2cbe98154c 100644
--- a/modules/keystore/file_crypt_android.c
+++ b/modules/keystore/file_crypt_android.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <vlc_common.h>
-#include <vlc_memory.h>
#include <vlc_keystore.h>
#include "file_crypt.h"
diff --git a/modules/keystore/memory.c b/modules/keystore/memory.c
index 624cc618d3..527433db9a 100644
--- a/modules/keystore/memory.c
+++ b/modules/keystore/memory.c
@@ -26,7 +26,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_memory.h>
#include <vlc_keystore.h>
#include <vlc_strings.h>
diff --git a/modules/misc/webservices/acoustid.c b/modules/misc/webservices/acoustid.c
index e867327233..910671a206 100644
--- a/modules/misc/webservices/acoustid.c
+++ b/modules/misc/webservices/acoustid.c
@@ -25,7 +25,6 @@
#include <vlc_common.h>
#include <vlc_stream.h>
#include <limits.h>
-#include <vlc_memory.h>
#include <vlc/vlc.h>
#include "acoustid.h"
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_list.c b/modules/spu/dynamicoverlay/dynamicoverlay_list.c
index 1eca32d64e..98db192c04 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay_list.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_list.c
@@ -27,7 +27,6 @@
#endif
#include <vlc_common.h>
-#include <vlc_memory.h>
#include "dynamicoverlay.h"
diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index de3bcf4c69..7f7bd3b4d1 100644
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -31,7 +31,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_memory.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
diff --git a/modules/video_output/opengl/converter_sw.c b/modules/video_output/opengl/converter_sw.c
index 8e710bba54..78d6843fb5 100644
--- a/modules/video_output/opengl/converter_sw.c
+++ b/modules/video_output/opengl/converter_sw.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <vlc_common.h>
-#include <vlc_memory.h>
#include "internal.h"
#ifndef GL_UNPACK_ROW_LENGTH
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 04294af30e..f9b9426215 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -36,7 +36,6 @@
#include <vlc_picture_pool.h>
#include <vlc_subpicture.h>
#include <vlc_opengl.h>
-#include <vlc_memory.h>
#include <vlc_modules.h>
#include <vlc_vout.h>
#include <vlc_viewpoint.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index b77ddf4132..99509b8a3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,7 +113,6 @@ noinst_HEADERS = \
../include/vlc_fixups.h \
../include/vlc_intf_strings.h \
../include/vlc_iso_lang.h \
- ../include/vlc_memory.h \
../include/vlc_pgpkey.h \
../include/vlc_update.h \
../include/vlc_vod.h \
diff --git a/src/input/stream.c b/src/input/stream.c
index d4d7c00745..0ed08df918 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -34,7 +34,6 @@
#include <vlc_common.h>
#include <vlc_block.h>
-#include <vlc_memory.h>
#include <vlc_access.h>
#include <vlc_charset.h>
#include <vlc_interrupt.h>
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 29044fa5d4..5df86f6710 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -25,7 +25,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_memory.h>
#include <assert.h>
#include <stdarg.h>
#include <limits.h>
More information about the vlc-commits
mailing list