[vlc-commits] MKV demux: fixed include-guards

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Mon Feb 22 01:12:56 2016 +0100| [92b83379c3c85029337b86a8a3769bb082b59961] | committer: Jean-Baptiste Kempf

MKV demux: fixed include-guards

  * renamed include-guards to fix issues with reserved identifiers

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=92b83379c3c85029337b86a8a3769bb082b59961
---

 modules/demux/mkv/Ebml_parser.hpp      |    4 ++--
 modules/demux/mkv/chapter_command.hpp  |    4 ++--
 modules/demux/mkv/chapters.hpp         |    4 ++--
 modules/demux/mkv/demux.hpp            |    4 ++--
 modules/demux/mkv/matroska_segment.hpp |    4 ++--
 modules/demux/mkv/mkv.hpp              |    4 ++--
 modules/demux/mkv/virtual_segment.hpp  |    4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/demux/mkv/Ebml_parser.hpp b/modules/demux/mkv/Ebml_parser.hpp
index 3d68f5c..419f55f 100644
--- a/modules/demux/mkv/Ebml_parser.hpp
+++ b/modules/demux/mkv/Ebml_parser.hpp
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#ifndef _EBML_PARSER_HPP_
-#define _EBML_PARSER_HPP_
+#ifndef VLC_MKV_EBML_PARSER_HPP_
+#define VLC_MKV_EBML_PARSER_HPP_
 
 #include "mkv.hpp"
 
diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
index 80b3e45..3969735 100644
--- a/modules/demux/mkv/chapter_command.hpp
+++ b/modules/demux/mkv/chapter_command.hpp
@@ -22,8 +22,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _CHAPTER_COMMAND_H_
-#define _CHAPTER_COMMAND_H_
+#ifndef VLC_MKV_CHAPTER_COMMAND_HPP_
+#define VLC_MKV_CHAPTER_COMMAND_HPP_
 
 #include "mkv.hpp"
 
diff --git a/modules/demux/mkv/chapters.hpp b/modules/demux/mkv/chapters.hpp
index 8d0e592..1b0885a 100644
--- a/modules/demux/mkv/chapters.hpp
+++ b/modules/demux/mkv/chapters.hpp
@@ -24,8 +24,8 @@
 
 /* chapter_item, chapter_edition, and chapter_translation classes */
 
-#ifndef _CHAPTER_H_
-#define _CHAPTER_H_
+#ifndef VLC_MKV_CHAPTERS_HPP_
+#define VLC_MKV_CHAPTERS_HPP_
 
 #include "mkv.hpp"
 
diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
index 0ebef69..49c1c22 100644
--- a/modules/demux/mkv/demux.hpp
+++ b/modules/demux/mkv/demux.hpp
@@ -22,8 +22,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _DEMUX_SYS_H
-#define _DEMUX_SYS_H
+#ifndef VLC_MKV_DEMUX_HPP_
+#define VLC_MKV_DEMUX_HPP_
 
 #include "mkv.hpp"
 
diff --git a/modules/demux/mkv/matroska_segment.hpp b/modules/demux/mkv/matroska_segment.hpp
index 8a9d9f6..790122b 100644
--- a/modules/demux/mkv/matroska_segment.hpp
+++ b/modules/demux/mkv/matroska_segment.hpp
@@ -22,8 +22,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MATROSKA_SEGMENT_HPP_
-#define _MATROSKA_SEGMENT_HPP_
+#ifndef VLC_MKV_MATROSKA_SEGMENT_HPP_
+#define VLC_MKV_MATROSKA_SEGMENT_HPP_
 
 #include "mkv.hpp"
 
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index d287a52..ed8cc89 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -22,8 +22,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MKV_H_
-#define _MKV_H_
+#ifndef VLC_MKV_MKV_HPP_
+#define VLC_MKV_MKV_HPP_
 
 /*****************************************************************************
  * Preamble
diff --git a/modules/demux/mkv/virtual_segment.hpp b/modules/demux/mkv/virtual_segment.hpp
index 94ed1e2..c192b22 100644
--- a/modules/demux/mkv/virtual_segment.hpp
+++ b/modules/demux/mkv/virtual_segment.hpp
@@ -23,8 +23,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VIRTUAL_SEGMENT_HPP_
-#define _VIRTUAL_SEGMENT_HPP_
+#ifndef VLC_MKV_VIRTUAL_SEGMENT_HPP_
+#define VLC_MKV_VIRTUAL_SEGMENT_HPP_
 
 #include "mkv.hpp"