mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
Replace multiple inclusion guards with leading underscores by default names.
Leading underscores are reserved for system identifiers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25579 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
24421b66fa
commit
baee7815d5
@ -12,8 +12,8 @@
|
|||||||
* license. See http://www.gnu.org/copyleft/gpl.html for details.
|
* license. See http://www.gnu.org/copyleft/gpl.html for details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __LINUX_MGAVID_H
|
#ifndef MGA_VID_H
|
||||||
#define __LINUX_MGAVID_H
|
#define MGA_VID_H
|
||||||
|
|
||||||
typedef struct mga_vid_config_s
|
typedef struct mga_vid_config_s
|
||||||
{
|
{
|
||||||
@ -56,4 +56,4 @@ uint32_t num_frames;
|
|||||||
|
|
||||||
#define MGA_VID_VERSION 0x0201
|
#define MGA_VID_VERSION 0x0201
|
||||||
|
|
||||||
#endif
|
#endif /* MGA_VID_H */
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
* and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
|
* and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _RADEON_H
|
#ifndef RADEON_H
|
||||||
#define _RADEON_H
|
#define RADEON_H
|
||||||
|
|
||||||
|
|
||||||
/* radeon PCI ids */
|
/* radeon PCI ids */
|
||||||
|
@ -13,8 +13,8 @@
|
|||||||
* mplayer's package.
|
* mplayer's package.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __RADEON_VID_INCLUDED
|
#ifndef RADEON_VID_H
|
||||||
#define __RADEON_VID_INCLUDED
|
#define RADEON_VID_H
|
||||||
|
|
||||||
typedef struct mga_vid_config_s
|
typedef struct mga_vid_config_s
|
||||||
{
|
{
|
||||||
@ -114,4 +114,4 @@ uint32_t num_frames;
|
|||||||
|
|
||||||
#define MGA_VID_VERSION 0x0201
|
#define MGA_VID_VERSION 0x0201
|
||||||
|
|
||||||
#endif
|
#endif /* RADEON_VID_H */
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef __af_h__
|
#ifndef AF_H
|
||||||
#define __af_h__
|
#define AF_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
@ -354,4 +354,4 @@ extern af_msg_cfg_t af_msg_cfg; // Message
|
|||||||
#endif
|
#endif
|
||||||
//! \}
|
//! \}
|
||||||
|
|
||||||
#endif /* __af_h__ */
|
#endif /* AF_H */
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/* The sample format system used lin libaf is based on bitmasks. The
|
/* The sample format system used lin libaf is based on bitmasks. The
|
||||||
format definition only refers to the storage format not the
|
format definition only refers to the storage format not the
|
||||||
resolution. */
|
resolution. */
|
||||||
#ifndef __af_format_h__
|
#ifndef AF_FORMAT_H
|
||||||
#define __af_format_h__
|
#define AF_FORMAT_H
|
||||||
|
|
||||||
#ifndef MPLAYER_CONFIG_H
|
#ifndef MPLAYER_CONFIG_H
|
||||||
#error af_format.h needs 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 char* af_fmt2str(int format, char* str, int size);
|
||||||
extern const char* af_fmt2str_short(int format);
|
extern const char* af_fmt2str_short(int format);
|
||||||
|
|
||||||
#endif /* __af_format_h__ */
|
#endif /* AF_FORMAT_H */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* Include file for mplayer specific defines and includes */
|
/* Include file for mplayer specific defines and includes */
|
||||||
#ifndef __af_mp_h__
|
#ifndef AF_MP_H
|
||||||
#define __af_mp_h__
|
#define AF_MP_H
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
@ -19,4 +19,4 @@
|
|||||||
#define af_msg(lev, args... ) \
|
#define af_msg(lev, args... ) \
|
||||||
mp_msg(MSGT_AFILTER,(((lev)<0)?((lev)+3):(((lev)==0)?MSGL_INFO:((lev)+5))), ##args )
|
mp_msg(MSGT_AFILTER,(((lev)<0)?((lev)+3):(((lev)==0)?MSGL_INFO:((lev)+5))), ##args )
|
||||||
|
|
||||||
#endif /* __af_mp_h__ */
|
#endif /* AF_MP_H */
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef __af_control_h
|
#ifndef AF_CONTROL_H
|
||||||
#define __af_control_h
|
#define AF_CONTROL_H
|
||||||
|
|
||||||
/*********************************************
|
/*********************************************
|
||||||
// Control info struct.
|
// 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_PLAYBACK_SPEED 0x00002500 | AF_CONTROL_FILTER_SPECIFIC
|
||||||
#define AF_CONTROL_SCALETEMPO_AMOUNT 0x00002600 | AF_CONTROL_FILTER_SPECIFIC
|
#define AF_CONTROL_SCALETEMPO_AMOUNT 0x00002600 | AF_CONTROL_FILTER_SPECIFIC
|
||||||
|
|
||||||
#endif /*__af_control_h */
|
#endif /* AF_CONTROL_H */
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#ifndef _OSDEP_MMAP_ANON_H_
|
#ifndef MMAP_ANON_H
|
||||||
#define _OSDEP_MMAP_ANON_H_
|
#define MMAP_ANON_H
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
void *mmap_anon(void *, size_t, int, int, off_t);
|
void *mmap_anon(void *, size_t, int, int, off_t);
|
||||||
|
|
||||||
#endif /* _OSDEP_MMAP_ANON_H_ */
|
#endif /* MMAP_ANON_H */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#ifndef _parser_cfg_h
|
#ifndef PARSER_CFG_H
|
||||||
#define _parser_cfg_h
|
#define PARSER_CFG_H
|
||||||
|
|
||||||
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
|
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
|
||||||
|
|
||||||
#endif
|
#endif /* PARSER_CFG_H */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#ifndef _parser_mpcmd_h
|
#ifndef PARSER_MPCMD_H
|
||||||
#define _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);
|
extern play_tree_t* m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv);
|
||||||
|
|
||||||
#endif
|
#endif /* PARSER_MPCMD_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user