From 4d644f513c841eaf4617edffb348338a798d37be Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 13 Oct 2008 16:23:55 +0000 Subject: Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__. This avoids a pointless indirection that only obscures what is really done. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cfg-common-opts.h') diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 6d6374de08..c067b5b4fb 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -15,7 +15,7 @@ {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif {"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, -- cgit v1.2.3 From ece6db7e97751c09972f91486dc31465676a1ead Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 16 Oct 2008 19:12:57 +0000 Subject: Add -nomsgcolor option to match -msgcolor, patch by swell.k gmail com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27789 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 1 + 1 file changed, 1 insertion(+) (limited to 'cfg-common-opts.h') diff --git a/cfg-common-opts.h b/cfg-common-opts.h index c067b5b4fb..8319fd26e2 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -10,6 +10,7 @@ {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL}, {"msglevel", msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"nomsgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, #ifdef CONFIG_ICONV {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, -- cgit v1.2.3