Add MPLAYER_ prefix to multiple inclusion guards.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2

10 files changed, 33 insertions, 32 deletions

diff --git a/libaf/af.h b/libaf/af.h
index 22139275e0..879b7c931c 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -1,5 +1,5 @@
-#ifndef AF_H
-#define AF_H
+#ifndef MPLAYER_AF_H
+#define MPLAYER_AF_H
 
 #include <stdio.h>
 
@@ -354,4 +354,4 @@ extern af_msg_cfg_t af_msg_cfg; // Message
 #endif
 //! \}
 
-#endif /* AF_H */
+#endif /* MPLAYER_AF_H */
diff --git a/libaf/af_format.h b/libaf/af_format.h
index 5588957882..b03779fd14 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -1,8 +1,9 @@
 /* The sample format system used lin libaf is based on bitmasks. The
    format definition only refers to the storage format not the
    resolution. */
-#ifndef AF_FORMAT_H
-#define AF_FORMAT_H
+
+#ifndef MPLAYER_AF_FORMAT_H
+#define MPLAYER_AF_FORMAT_H
 
 #ifndef MPLAYER_CONFIG_H
 #error af_format.h needs config.h
@@ -93,4 +94,4 @@ extern int af_bits2fmt(int bits);
 extern char* af_fmt2str(int format, char* str, int size);
 extern const char* af_fmt2str_short(int format);
 
-#endif /* AF_FORMAT_H */
+#endif /* MPLAYER_AF_FORMAT_H */
diff --git a/libaf/af_hrtf.h b/libaf/af_hrtf.h
index 59e5a44ee9..1a5c73e579 100644
--- a/libaf/af_hrtf.h
+++ b/libaf/af_hrtf.h
@@ -1,5 +1,5 @@
-#ifndef AF_HRTF_H
-#define AF_HRTF_H
+#ifndef MPLAYER_AF_HRTF_H
+#define MPLAYER_AF_HRTF_H
 
 #define HRTF_MIX_51 0
 #define HRTF_MIX_STEREO 1
@@ -490,4 +490,4 @@ float cr_filt[128] = {
    -0.0002379619297227554, 0.0007130120121089036
 };
 
-#endif /* AF_HRTF_H */
+#endif /* MPLAYER_AF_HRTF_H */
diff --git a/libaf/af_mp.h b/libaf/af_mp.h
index 3130b77ef0..3c10c9466d 100644
--- a/libaf/af_mp.h
+++ b/libaf/af_mp.h
@@ -1,6 +1,6 @@
 /* Include file for mplayer specific defines and includes */
-#ifndef AF_MP_H
-#define AF_MP_H
+#ifndef MPLAYER_AF_MP_H
+#define MPLAYER_AF_MP_H
 
 #include "config.h"
 #include "mp_msg.h"
@@ -19,4 +19,4 @@
 #define af_msg(lev, args... ) \
   mp_msg(MSGT_AFILTER,(((lev)<0)?((lev)+3):(((lev)==0)?MSGL_INFO:((lev)+5))), ##args )
 
-#endif /* AF_MP_H */
+#endif /* MPLAYER_AF_MP_H */
diff --git a/libaf/control.h b/libaf/control.h
index 2dc94b6afb..29fa46a5f3 100644
--- a/libaf/control.h
+++ b/libaf/control.h
@@ -1,5 +1,5 @@
-#ifndef AF_CONTROL_H
-#define AF_CONTROL_H
+#ifndef MPLAYER_CONTROL_H
+#define MPLAYER_CONTROL_H
 
 /*********************************************
 // Control info struct. 
@@ -234,4 +234,4 @@ typedef struct af_control_ext_s{
 #define AF_CONTROL_PLAYBACK_SPEED	0x00002500 | AF_CONTROL_FILTER_SPECIFIC
 #define AF_CONTROL_SCALETEMPO_AMOUNT	0x00002600 | AF_CONTROL_FILTER_SPECIFIC
 
-#endif /* AF_CONTROL_H */
+#endif /* MPLAYER_CONTROL_H */
diff --git a/libaf/dsp.h b/libaf/dsp.h
index 2acf8dac0d..0fe9574e55 100644
--- a/libaf/dsp.h
+++ b/libaf/dsp.h
@@ -8,8 +8,8 @@
 //=============================================================================
 */
 
-#ifndef	DSP_H
-#define	DSP_H
+#ifndef	MPLAYER_DSP_H
+#define	MPLAYER_DSP_H
 
 /* Implementation of routines used for DSP */
 
@@ -19,4 +19,4 @@
 #include <window.h>
 #include <filter.h>
 
-#endif /* DSP_H */
+#endif /* MPLAYER_DSP_H */
diff --git a/libaf/equalizer.h b/libaf/equalizer.h
index 45a4757d16..8accd97804 100644
--- a/libaf/equalizer.h
+++ b/libaf/equalizer.h
@@ -8,8 +8,8 @@
 //=============================================================================
 */
 
-#ifndef EQUALIZER_H
-#define EQUALIZER_H
+#ifndef MPLAYER_EQUALIZER_H
+#define MPLAYER_EQUALIZER_H
 
 /* Equalizer plugin header file defines struct used for setting or
    getting the gain of a specific channel and frequency */
@@ -35,4 +35,4 @@ nr.    	center frequency
 9       16.00 kHz
 */
 
-#endif /* EQUALIZER_H */
+#endif /* MPLAYER_EQUALIZER_H */
diff --git a/libaf/filter.h b/libaf/filter.h
index 92ff229910..31293f051b 100644
--- a/libaf/filter.h
+++ b/libaf/filter.h
@@ -8,12 +8,12 @@
 //=============================================================================
 */
 
-#if !defined DSP_H
+#if !defined MPLAYER_DSP_H
 # error "Never use <filter.h> directly; include <dsp.h> instead"
 #endif
 
-#ifndef FILTER_H
-#define FILTER_H
+#ifndef MPLAYER_FILTER_H
+#define MPLAYER_FILTER_H
 
 
 // Design and implementation of different types of digital filters 
@@ -66,4 +66,4 @@ extern int af_filter_szxform(_ftype_t* a, _ftype_t* b, _ftype_t Q, _ftype_t fc,
   xq[xi]=(xq)[(xi)+(n)]=*(in);\
   xi=(++(xi))&((n)-1);
 
-#endif /* FILTER_H */
+#endif /* MPLAYER_FILTER_H */
diff --git a/libaf/reorder_ch.h b/libaf/reorder_ch.h
index 857b9d708e..d48766ab9f 100644
--- a/libaf/reorder_ch.h
+++ b/libaf/reorder_ch.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REORDER_CH_H
-#define REORDER_CH_H
+#ifndef MPLAYER_REORDER_CH_H
+#define MPLAYER_REORDER_CH_H
 
 // L   - Left
 // R   - Right
@@ -122,4 +122,4 @@ void reorder_channel_nch(void *buf,
                          int samples,
                          int samplesize);
 
-#endif /* REORDER_CH_H */
+#endif /* MPLAYER_REORDER_CH_H */
diff --git a/libaf/window.h b/libaf/window.h
index 6e18414ba3..b45f6e097e 100644
--- a/libaf/window.h
+++ b/libaf/window.h
@@ -15,12 +15,12 @@
    coefficients will be stored.
 */
 
-#if !defined DSP_H
+#if !defined MPLAYER_DSP_H
 # error "Never use <window.h> directly; include <dsp.h> instead"
 #endif
 
-#ifndef WINDOW_H
-#define WINDOW_H
+#ifndef MPLAYER_WINDOW_H
+#define MPLAYER_WINDOW_H
 
 extern void af_window_boxcar(int n, _ftype_t* w);
 extern void af_window_triang(int n, _ftype_t* w);
@@ -30,4 +30,4 @@ extern void af_window_blackman(int n,_ftype_t* w);
 extern void af_window_flattop(int n,_ftype_t* w);
 extern void af_window_kaiser(int n, _ftype_t* w,_ftype_t b);
 
-#endif /* WINDOW_H */
+#endif /* MPLAYER_WINDOW_H */