summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mga_vid.h6
-rw-r--r--drivers/radeon.h6
-rw-r--r--drivers/radeon_vid.h6
-rw-r--r--libaf/af.h6
-rw-r--r--libaf/af_format.h6
-rw-r--r--libaf/af_mp.h6
-rw-r--r--libaf/control.h6
-rw-r--r--osdep/mmap_anon.h6
-rw-r--r--parser-cfg.h6
-rw-r--r--parser-mpcmd.h6
10 files changed, 30 insertions, 30 deletions
diff --git a/drivers/mga_vid.h b/drivers/mga_vid.h
index 0a4f378385..4b0a48ee58 100644
--- a/drivers/mga_vid.h
+++ b/drivers/mga_vid.h
@@ -12,8 +12,8 @@
* license. See http://www.gnu.org/copyleft/gpl.html for details.
*/
-#ifndef __LINUX_MGAVID_H
-#define __LINUX_MGAVID_H
+#ifndef MGA_VID_H
+#define MGA_VID_H
typedef struct mga_vid_config_s
{
@@ -56,4 +56,4 @@ uint32_t num_frames;
#define MGA_VID_VERSION 0x0201
-#endif
+#endif /* MGA_VID_H */
diff --git a/drivers/radeon.h b/drivers/radeon.h
index 764e491c00..80169e0970 100644
--- a/drivers/radeon.h
+++ b/drivers/radeon.h
@@ -8,8 +8,8 @@
* and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
*/
-#ifndef _RADEON_H
-#define _RADEON_H
+#ifndef RADEON_H
+#define RADEON_H
/* radeon PCI ids */
@@ -2043,4 +2043,4 @@
/* End of field default values. */
-#endif /* RADEON_H */
+#endif /* RADEON_H */
diff --git a/drivers/radeon_vid.h b/drivers/radeon_vid.h
index ef864f5de1..8a2c0343e9 100644
--- a/drivers/radeon_vid.h
+++ b/drivers/radeon_vid.h
@@ -13,8 +13,8 @@
* mplayer's package.
*/
-#ifndef __RADEON_VID_INCLUDED
-#define __RADEON_VID_INCLUDED
+#ifndef RADEON_VID_H
+#define RADEON_VID_H
typedef struct mga_vid_config_s
{
@@ -114,4 +114,4 @@ uint32_t num_frames;
#define MGA_VID_VERSION 0x0201
-#endif
+#endif /* RADEON_VID_H */
diff --git a/libaf/af.h b/libaf/af.h
index a4dc6f9535..22139275e0 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -1,5 +1,5 @@
-#ifndef __af_h__
-#define __af_h__
+#ifndef AF_H
+#define AF_H
#include <stdio.h>
@@ -354,4 +354,4 @@ extern af_msg_cfg_t af_msg_cfg; // Message
#endif
//! \}
-#endif /* __af_h__ */
+#endif /* AF_H */
diff --git a/libaf/af_format.h b/libaf/af_format.h
index 1cc26c3096..5588957882 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -1,8 +1,8 @@
/* 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 AF_FORMAT_H
+#define AF_FORMAT_H
#ifndef MPLAYER_CONFIG_H
#error af_format.h needs config.h
@@ -93,4 +93,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 /* AF_FORMAT_H */
diff --git a/libaf/af_mp.h b/libaf/af_mp.h
index f2ddd873fc..3130b77ef0 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 AF_MP_H
+#define 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 /* AF_MP_H */
diff --git a/libaf/control.h b/libaf/control.h
index 7c6a8dd371..2dc94b6afb 100644
--- a/libaf/control.h
+++ b/libaf/control.h
@@ -1,5 +1,5 @@
-#ifndef __af_control_h
-#define __af_control_h
+#ifndef AF_CONTROL_H
+#define AF_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 /* AF_CONTROL_H */
diff --git a/osdep/mmap_anon.h b/osdep/mmap_anon.h
index e0f2d4e1ed..7845a9bc05 100644
--- a/osdep/mmap_anon.h
+++ b/osdep/mmap_anon.h
@@ -1,8 +1,8 @@
-#ifndef _OSDEP_MMAP_ANON_H_
-#define _OSDEP_MMAP_ANON_H_
+#ifndef MMAP_ANON_H
+#define MMAP_ANON_H
#include <sys/types.h>
void *mmap_anon(void *, size_t, int, int, off_t);
-#endif /* _OSDEP_MMAP_ANON_H_ */
+#endif /* MMAP_ANON_H */
diff --git a/parser-cfg.h b/parser-cfg.h
index bd537806cb..8a54cc9353 100644
--- a/parser-cfg.h
+++ b/parser-cfg.h
@@ -1,6 +1,6 @@
-#ifndef _parser_cfg_h
-#define _parser_cfg_h
+#ifndef PARSER_CFG_H
+#define PARSER_CFG_H
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
-#endif
+#endif /* PARSER_CFG_H */
diff --git a/parser-mpcmd.h b/parser-mpcmd.h
index 0e3f35676e..de5aa5a549 100644
--- a/parser-mpcmd.h
+++ b/parser-mpcmd.h
@@ -1,6 +1,6 @@
-#ifndef _parser_mpcmd_h
-#define _parser_mpcmd_h
+#ifndef PARSER_MPCMD_H
+#define PARSER_MPCMD_H
extern play_tree_t* m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv);
-#endif
+#endif /* PARSER_MPCMD_H */