[MPlayer-cvslog] r30205 - in trunk/mp3lib: huffman.h l2tables.h mp3.h mpg123.h

diego subversion at mplayerhq.hu
Mon Jan 4 15:43:00 CET 2010


Author: diego
Date: Mon Jan  4 15:42:59 2010
New Revision: 30205

Log:
Add multiple inclusion guards to all mp3lib headers.

Modified:
   trunk/mp3lib/huffman.h
   trunk/mp3lib/l2tables.h
   trunk/mp3lib/mp3.h
   trunk/mp3lib/mpg123.h

Modified: trunk/mp3lib/huffman.h
==============================================================================
--- trunk/mp3lib/huffman.h	Mon Jan  4 14:13:10 2010	(r30204)
+++ trunk/mp3lib/huffman.h	Mon Jan  4 15:42:59 2010	(r30205)
@@ -6,6 +6,9 @@
  * smaller tables are often the part of a bigger table
  */
 
+#ifndef MPLAYER_MP3LIB_HUFFMAN_H
+#define MPLAYER_MP3LIB_HUFFMAN_H
+
 struct newhuff
 {
   unsigned int linbits;
@@ -329,4 +332,4 @@ static struct newhuff htc[] =
  { /* 1 , 1 , */ 0 , tab_c1 }
 };
 
-
+#endif /* MPLAYER_MP3LIB_HUFFMAN_H */

Modified: trunk/mp3lib/l2tables.h
==============================================================================
--- trunk/mp3lib/l2tables.h	Mon Jan  4 14:13:10 2010	(r30204)
+++ trunk/mp3lib/l2tables.h	Mon Jan  4 15:42:59 2010	(r30205)
@@ -4,6 +4,9 @@
  * $Id$
  */
 
+#ifndef MPLAYER_MP3LIB_L2TABLES_H
+#define MPLAYER_MP3LIB_L2TABLES_H
+
 /*
  * Layer 2 Alloc tables ..
  * most other tables are calculated on program start (which is (of course)
@@ -158,3 +161,4 @@ static struct al_table alloc_4[] = {
     {2,0},{5,3},{7,5},{10,9},
     {2,0},{5,3},{7,5},{10,9}  };
 
+#endif /* MPLAYER_MP3LIB_L2TABLES_H */

Modified: trunk/mp3lib/mp3.h
==============================================================================
--- trunk/mp3lib/mp3.h	Mon Jan  4 14:13:10 2010	(r30204)
+++ trunk/mp3lib/mp3.h	Mon Jan  4 15:42:59 2010	(r30205)
@@ -1,5 +1,8 @@
 /* MP3 Player Library 2.0      (C) 1999 A'rpi/Astral&ESP-team  */
 
+#ifndef MPLAYER_MP3LIB_MP3_H
+#define MPLAYER_MP3LIB_MP3_H
+
 /* decoder level: */
 #ifdef CONFIG_FAKE_MONO
 void MP3_Init(int fakemono);
@@ -33,3 +36,4 @@ void MP3_Play(void);
 void MP3_Stop(void);
 void MP3_CloseDevice(void);
 
+#endif /* MPLAYER_MP3LIB_MP3_H */

Modified: trunk/mp3lib/mpg123.h
==============================================================================
--- trunk/mp3lib/mpg123.h	Mon Jan  4 14:13:10 2010	(r30204)
+++ trunk/mp3lib/mpg123.h	Mon Jan  4 15:42:59 2010	(r30205)
@@ -9,6 +9,9 @@
  * used source: musicout.h from mpegaudio package
  */
 
+#ifndef MPLAYER_MP3LIB_MPG123_H
+#define MPLAYER_MP3LIB_MPG123_H
+
 #include "config.h"
 
 #ifndef M_PI
@@ -126,3 +129,5 @@ void dct36_sse(real *, real *, real *, r
 
 typedef int (*synth_func_t)( real *,int,short * );
 typedef void (*dct36_func_t)(real *,real *,real *,real *,real *);
+
+#endif /* MPLAYER_MP3LIB_MPG123_H */


More information about the MPlayer-cvslog mailing list