From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6Izp-0007w0-EI for qemu-devel@nongnu.org; Wed, 31 Dec 2014 08:07:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y6Izj-0007S3-Nl for qemu-devel@nongnu.org; Wed, 31 Dec 2014 08:07:29 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:37588 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6Izj-0007MG-Cn for qemu-devel@nongnu.org; Wed, 31 Dec 2014 08:07:23 -0500 From: "Denis V. Lunev" Date: Wed, 31 Dec 2014 16:06:47 +0300 Message-Id: <1420031214-6053-2-git-send-email-den@openvz.org> In-Reply-To: <1420031214-6053-1-git-send-email-den@openvz.org> References: <1420031214-6053-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 1/8] qga: fixed warning in qemu-ga.exe for mingw >= 4.9.1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Olga Krishtal , qemu-devel@nongnu.org, "Denis V. Lunev" From: Olga Krishtal strtok_r was redefined before the patch Signed-off-by: Olga Krishtal Signed-off-by: Denis V. Lunev CC: Michael Roth --- 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