RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fix -Wduplicate-decl-specifier warnings with clang

This commit is contained in:
Stefano Pigozzi 2014-10-09 21:51:10 +02:00
parent dba2b90d9a
commit e99a37f635
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/msg.c
View File

@ -592,7 +592,7 @@ void mp_msg(struct mp_log *log, int lev, const char *format, ...)
va_end(va); va_end(va);
} }
const char *const mp_log_levels[MSGL_MAX + 1] = { const char *mp_log_levels[MSGL_MAX + 1] = {
[MSGL_FATAL] = "fatal", [MSGL_FATAL] = "fatal",
[MSGL_ERR] = "error", [MSGL_ERR] = "error",
[MSGL_WARN] = "warn", [MSGL_WARN] = "warn",
@ -604,7 +604,7 @@ const char *const mp_log_levels[MSGL_MAX + 1] = {
[MSGL_STATS] = "stats", [MSGL_STATS] = "stats",
}; };
const int const mp_mpv_log_levels[MSGL_MAX + 1] = { const int mp_mpv_log_levels[MSGL_MAX + 1] = {
[MSGL_FATAL] = MPV_LOG_LEVEL_FATAL, [MSGL_FATAL] = MPV_LOG_LEVEL_FATAL,
[MSGL_ERR] = MPV_LOG_LEVEL_ERROR, [MSGL_ERR] = MPV_LOG_LEVEL_ERROR,
[MSGL_WARN] = MPV_LOG_LEVEL_WARN, [MSGL_WARN] = MPV_LOG_LEVEL_WARN,

4
common/msg_control.h
View File

@ -31,7 +31,7 @@ int mp_msg_open_stats_file(struct mpv_global *global, const char *path);
struct bstr; struct bstr;
int mp_msg_split_msglevel(struct bstr *s, struct bstr *out_mod, int *out_level); int mp_msg_split_msglevel(struct bstr *s, struct bstr *out_mod, int *out_level);
extern const char *const mp_log_levels[MSGL_MAX + 1]; extern const char *mp_log_levels[MSGL_MAX + 1];
extern const int const mp_mpv_log_levels[MSGL_MAX + 1]; extern const int mp_mpv_log_levels[MSGL_MAX + 1];
#endif #endif