michael@0: diff --git a/media/libvpx/vpx/src/svc_encodeframe.c b/media/libvpx/vpx/src/svc_encodeframe.c michael@0: index 57d21dc..2514ad3 100644 michael@0: --- a/media/libvpx/vpx/src/svc_encodeframe.c michael@0: +++ b/media/libvpx/vpx/src/svc_encodeframe.c michael@0: @@ -18,21 +18,23 @@ michael@0: #include michael@0: #include michael@0: #define VPX_DISABLE_CTRL_TYPECHECKS 1 michael@0: #define VPX_CODEC_DISABLE_COMPAT 1 michael@0: #include "vpx/svc_context.h" michael@0: #include "vpx/vp8cx.h" michael@0: #include "vpx/vpx_encoder.h" michael@0: michael@0: -#if defined(__MINGW32__) && !defined(MINGW_HAS_SECURE_API) michael@0: +#ifdef __MINGW32__ michael@0: #define strtok_r strtok_s michael@0: +#ifndef MINGW_HAS_SECURE_API michael@0: // proto from /usr/x86_64-w64-mingw32/include/sec_api/string_s.h michael@0: _CRTIMP char *__cdecl strtok_s(char *str, const char *delim, char **context); michael@0: -#endif michael@0: +#endif /* MINGW_HAS_SECURE_API */ michael@0: +#endif /* __MINGW32__ */ michael@0: michael@0: #ifdef _MSC_VER michael@0: #define strdup _strdup michael@0: #define strtok_r strtok_s michael@0: #endif michael@0: michael@0: #define SVC_REFERENCE_FRAMES 8 michael@0: #define SUPERFRAME_SLOTS (8)