[MPlayer-cvslog] r25579 - in trunk: drivers/mga_vid.h drivers/radeon.h drivers/radeon_vid.h libaf/af.h libaf/af_format.h libaf/af_mp.h libaf/control.h osdep/mmap_anon.h parser-cfg.h parser-mpcmd.h

[diego]

Author: diego
Date: Tue Jan  1 21:21:20 2008
New Revision: 25579

Log:
Replace multiple inclusion guards with leading underscores by default names.
Leading underscores are reserved for system identifiers.


Modified:
   trunk/drivers/mga_vid.h
   trunk/drivers/radeon.h
   trunk/drivers/radeon_vid.h
   trunk/libaf/af.h
   trunk/libaf/af_format.h
   trunk/libaf/af_mp.h
   trunk/libaf/control.h
   trunk/osdep/mmap_anon.h
   trunk/parser-cfg.h
   trunk/parser-mpcmd.h

Modified: trunk/drivers/mga_vid.h
==============================================================================
--- trunk/drivers/mga_vid.h	(original)
+++ trunk/drivers/mga_vid.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/drivers/radeon.h
==============================================================================
--- trunk/drivers/radeon.h	(original)
+++ trunk/drivers/radeon.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/drivers/radeon_vid.h
==============================================================================
--- trunk/drivers/radeon_vid.h	(original)
+++ trunk/drivers/radeon_vid.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/libaf/af.h
==============================================================================
--- trunk/libaf/af.h	(original)
+++ trunk/libaf/af.h	Tue Jan  1 21:21:20 2008
@@ -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; // Messa
 #endif
 //! \}
 
-#endif /* __af_h__ */
+#endif /* AF_H */

Modified: trunk/libaf/af_format.h
==============================================================================
--- trunk/libaf/af_format.h	(original)
+++ trunk/libaf/af_format.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/libaf/af_mp.h
==============================================================================
--- trunk/libaf/af_mp.h	(original)
+++ trunk/libaf/af_mp.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/libaf/control.h
==============================================================================
--- trunk/libaf/control.h	(original)
+++ trunk/libaf/control.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/osdep/mmap_anon.h
==============================================================================
--- trunk/osdep/mmap_anon.h	(original)
+++ trunk/osdep/mmap_anon.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/parser-cfg.h
==============================================================================
--- trunk/parser-cfg.h	(original)
+++ trunk/parser-cfg.h	Tue Jan  1 21:21:20 2008
@@ -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 */

Modified: trunk/parser-mpcmd.h
==============================================================================
--- trunk/parser-mpcmd.h	(original)
+++ trunk/parser-mpcmd.h	Tue Jan  1 21:21:20 2008
@@ -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 */