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

[Filip Roséen]

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

mp4 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=890b77c3b5cd7d9860b69b75765e500bcf42e4ae
---

 modules/demux/mp4/fragments.h |    4 ++--
 modules/demux/mp4/languages.h |    4 ++--
 modules/demux/mp4/libmp4.h    |    4 ++--
 modules/demux/mp4/mp4.h       |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/demux/mp4/fragments.h b/modules/demux/mp4/fragments.h
index a7a6c9a..a4f84c9 100644
--- a/modules/demux/mp4/fragments.h
+++ b/modules/demux/mp4/fragments.h
@@ -17,8 +17,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 _VLC_FRAGMENTS_H
-#define _VLC_FRAGMENTS_H 1
+#ifndef VLC_MP4_FRAGMENTS_H_
+#define VLC_MP4_FRAGMENTS_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/demux/mp4/languages.h b/modules/demux/mp4/languages.h
index de7b04a..70be688 100644
--- a/modules/demux/mp4/languages.h
+++ b/modules/demux/mp4/languages.h
@@ -17,8 +17,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 _VLC_MP4_LANGUAGES_H
-#define _VLC_MP4_LANGUAGES_H 1
+#ifndef VLC_MP4_LANGUAGES_H_
+#define VLC_MP4_LANGUAGES_H_
 
 static bool decodeQtLanguageCode( uint16_t i_language_code, char *psz_iso,
                                   bool *b_mactables )
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 20a9c27..8da1109 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -20,8 +20,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_LIBMP4_H
-#define _VLC_LIBMP4_H 1
+#ifndef VLC_MP4_LIBMP4_H_
+#define VLC_MP4_LIBMP4_H_
 
 #include <vlc_es.h>
 #include <vlc_codecs.h>
diff --git a/modules/demux/mp4/mp4.h b/modules/demux/mp4/mp4.h
index 2119748..1134d33 100644
--- a/modules/demux/mp4/mp4.h
+++ b/modules/demux/mp4/mp4.h
@@ -18,8 +18,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 _VLC_MP4_H
-#define _VLC_MP4_H 1
+#ifndef VLC_MP4_MP4_H_
+#define VLC_MP4_MP4_H_
 
 /*****************************************************************************
  * Preamble