diff options
| author |  Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-10-09 21:51:10 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-10-09 22:14:41 +0200 |
| commit | e99a37f635ae1ddf933ce4a21634946b3fca3330 (patch) | |
| tree | dc2849391f68ce9ded393617f257c693bcb970ee | |
| parent | dba2b90d9a34055e98c9216bd305a5cb4fb01a3a (diff) | |
fix -Wduplicate-decl-specifier warnings with clang
| -rw-r--r-- | common/msg.c | 4 | ||||
| -rw-r--r-- | common/msg_control.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/msg.c b/common/msg.c index 5beb663c9c..ebd976eaa3 100644 --- a/common/msg.c +++ b/common/msg.c @@ -592,7 +592,7 @@ void mp_msg(struct mp_log *log, int lev, const char *format, ...) va_end(va); } -const char *const mp_log_levels[MSGL_MAX + 1] = { +const char *mp_log_levels[MSGL_MAX + 1] = { [MSGL_FATAL] = "fatal", [MSGL_ERR] = "error", [MSGL_WARN] = "warn", @@ -604,7 +604,7 @@ const char *const mp_log_levels[MSGL_MAX + 1] = { [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_ERR] = MPV_LOG_LEVEL_ERROR, [MSGL_WARN] = MPV_LOG_LEVEL_WARN, diff --git a/common/msg_control.h b/common/msg_control.h index cd2cefa249..151117a68d 100644 --- a/common/msg_control.h +++ b/common/msg_control.h @@ -31,7 +31,7 @@ int mp_msg_open_stats_file(struct mpv_global *global, const char *path); struct bstr; 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 int const mp_mpv_log_levels[MSGL_MAX + 1]; +extern const char *mp_log_levels[MSGL_MAX + 1]; +extern const int mp_mpv_log_levels[MSGL_MAX + 1]; #endif |