From: Olga Krishtal <okrish...@parallels.com> strtok_r was redefined before the patch
Signed-off-by: Olga Krishtal <okrish...@parallels.com> Signed-off-by: Denis V. Lunev <d...@openvz.org> CC: Michael Roth <mdr...@linux.vnet.ibm.com> --- include/sysemu/os-win32.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index af3fbc4..84e229b 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -81,7 +81,9 @@ struct tm *gmtime_r(const time_t *timep, struct tm *result); #undef localtime_r struct tm *localtime_r(const time_t *timep, struct tm *result); +#if defined __MINGW32__ && !(__GNUC__ >= 4 && __GNUC_MINOR__ >= 9) char *strtok_r(char *str, const char *delim, char **saveptr); +#endif static inline void os_setup_signal_handling(void) {} static inline void os_daemonize(void) {} -- 1.9.1