Mercurial > mplayer.hg
comparison cfg-common-opts.h @ 27727:48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.
author | diego |
---|---|
date | Mon, 13 Oct 2008 16:23:55 +0000 |
parents | d47744b95b78 |
children | 69f545e290ea |
comparison
equal
deleted
inserted
replaced
27726:5e3c7164f943 | 27727:48c1ae64255b |
---|---|
13 {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, | 13 {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, |
14 #ifdef CONFIG_ICONV | 14 #ifdef CONFIG_ICONV |
15 {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, | 15 {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, |
16 #endif | 16 #endif |
17 {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, | 17 {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, |
18 #ifdef WIN32 | 18 #if defined(__MINGW32__) || defined(__CYGWIN__) |
19 {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 19 {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
20 #endif | 20 #endif |
21 {"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, | 21 {"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, |
22 | 22 |
23 // ------------------------- stream options -------------------- | 23 // ------------------------- stream options -------------------- |