diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /cfg-common.h | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'cfg-common.h')
-rw-r--r-- | cfg-common.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cfg-common.h b/cfg-common.h index 607333a52d..719c53bf0d 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -342,9 +342,7 @@ const m_option_t msgl_config[]={ }; -extern char * proc_priority; - -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) struct { char* name; int prio; @@ -361,7 +359,7 @@ struct { { "idle", IDLE_PRIORITY_CLASS}, { NULL, NORMAL_PRIORITY_CLASS} /* default */ }; -#endif /* WIN32 */ +#endif /* defined(__MINGW32__) || defined(__CYGWIN__) */ extern const m_option_t noconfig_opts[]; |