mirror of
https://github.com/mpv-player/mpv
synced 2024-12-29 02:22:19 +00:00
Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
973a0844aa
commit
8a00a66de3
@ -22,7 +22,7 @@
|
||||
#endif
|
||||
|
||||
#undef TEXTUREFORMAT_ALWAYS
|
||||
#ifdef SYS_DARWIN
|
||||
#ifdef __APPLE__
|
||||
#define TEXTUREFORMAT_ALWAYS GL_RGBA8
|
||||
#endif
|
||||
|
||||
@ -808,7 +808,7 @@ query_format(uint32_t format)
|
||||
return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD |
|
||||
VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
|
||||
break;
|
||||
#ifdef SYS_DARWIN
|
||||
#ifdef __APPLE__
|
||||
case IMGFMT_RGB32:
|
||||
#else
|
||||
case IMGFMT_RGB24:
|
||||
|
@ -731,7 +731,7 @@ static void set_fullmode (int mode) {
|
||||
* re-assign it. The comment in sdl_close() seems to imply that we
|
||||
* should not free() anything.
|
||||
*/
|
||||
#ifdef SYS_DARWIN
|
||||
#ifdef __APPLE__
|
||||
{
|
||||
const SDL_VideoInfo *vidInfo = NULL;
|
||||
vidInfo = SDL_GetVideoInfo ();
|
||||
|
@ -1055,7 +1055,7 @@ void init_vo_spudec(void) {
|
||||
* make it all work is to use the builtin SDL-bootstrap code, which
|
||||
* will be done automatically by replacing our main() if we include SDL.h.
|
||||
*/
|
||||
#if defined(SYS_DARWIN) && defined(HAVE_SDL)
|
||||
#if defined(__APPLE__) && defined(HAVE_SDL)
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user