diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:54:52 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:55:05 +0300 |
| commit | e913d6c5dabcf342d8c1a7070382d712fc354948 (patch) | |
| tree | 965b5b698c7075e53123593eb4b5bfdb45d78c56 /libmenu | |
| parent | be935e27666d8fdbf387adb1fcc30d243f6359dc (diff) | |
| parent | 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff) | |
| download | mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2 mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz | |
Merge svn changes up to r31004
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu_chapsel.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_cmdlist.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_console.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_dvbin.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_filesel.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_param.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_pt.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_txt.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/libmenu/menu_chapsel.c b/libmenu/menu_chapsel.c index f350655311..fb159eaeee 100644 --- a/libmenu/menu_chapsel.c +++ b/libmenu/menu_chapsel.c @@ -61,7 +61,7 @@ static struct menu_priv_s cfg_dflt = { #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m) -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title", ST_OFF (title), CONF_TYPE_STRING, 0, 0, 0, NULL }, { "auto-close", ST_OFF (auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL }, diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index 4d29fa14fe..d09c45fc8d 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -58,7 +58,7 @@ static struct menu_priv_s cfg_dflt = { MENU_LIST_PRIV_DFLT, }; -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title",M_ST_OFF(struct menu_priv_s,p.title), CONF_TYPE_STRING, 0, 0, 0, NULL }, { NULL, NULL, NULL, 0,0,0,NULL } diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c index f0bb029e91..8e82412327 100644 --- a/libmenu/menu_console.c +++ b/libmenu/menu_console.c @@ -109,7 +109,7 @@ static struct menu_priv_s cfg_dflt = { #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m) -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { { "prompt", ST_OFF(mp_prompt), CONF_TYPE_STRING, M_OPT_MIN, 1, 0, NULL }, { "child-prompt", ST_OFF(child_prompt), CONF_TYPE_STRING, M_OPT_MIN, 1, 0, NULL }, { "buffer-lines", ST_OFF(buf_lines), CONF_TYPE_INT, M_OPT_MIN, 5, 0, NULL }, diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c index e2b99a0f07..35ce114687 100644 --- a/libmenu/menu_dvbin.c +++ b/libmenu/menu_dvbin.c @@ -64,7 +64,7 @@ struct menu_priv_s { #define ST_OFF(m) M_ST_OFF(struct menu_priv_s, m) #define mpriv (menu->priv) -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title", ST_OFF(title), CONF_TYPE_STRING, 0, 0, 0, NULL }, { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL }, diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index fd16642ddf..aa15cc0147 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -79,7 +79,7 @@ static struct menu_priv_s cfg_dflt = { #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m) -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "path", ST_OFF(path), CONF_TYPE_STRING, 0, 0, 0, NULL }, { "title", ST_OFF(title), CONF_TYPE_STRING, 0, 0, 0, NULL }, diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c index f1836dffe0..135761b3d0 100644 --- a/libmenu/menu_param.c +++ b/libmenu/menu_param.c @@ -68,7 +68,7 @@ static struct menu_priv_s cfg_dflt = { 1 }; -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title", M_ST_OFF(menu_list_priv_t,title), CONF_TYPE_STRING, 0, 0, 0, NULL }, { "na", M_ST_OFF(struct menu_priv_s,na), CONF_TYPE_STRING, 0, 0, 0, NULL }, diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c index ceba4de41a..7008db2896 100644 --- a/libmenu/menu_pt.c +++ b/libmenu/menu_pt.c @@ -59,7 +59,7 @@ static struct menu_priv_s cfg_dflt = { #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m) -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title", ST_OFF(title), CONF_TYPE_STRING, 0, 0, 0, NULL }, { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL }, diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c index 7064167b67..308d9547c0 100644 --- a/libmenu/menu_txt.c +++ b/libmenu/menu_txt.c @@ -55,7 +55,7 @@ static struct menu_priv_s cfg_dflt = { #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m) -static m_option_t cfg_fields[] = { +static const m_option_t cfg_fields[] = { { "minbor", ST_OFF(minb), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, { "hspace", ST_OFF(hspace), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, { "file", ST_OFF(file), CONF_TYPE_STRING, 0, 0, 0, NULL }, |