From patchwork Tue Aug 23 18:11:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 9296153 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B7AE607F0 for ; Tue, 23 Aug 2016 18:12:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 810EB287F1 for ; Tue, 23 Aug 2016 18:12:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 759D628C9A; Tue, 23 Aug 2016 18:12:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 938BA287F1 for ; Tue, 23 Aug 2016 18:11:58 +0000 (UTC) Received: from localhost ([::1]:47723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcGB2-0001KF-ML for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Aug 2016 14:11:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcGAm-0001Jr-18 for qemu-devel@nongnu.org; Tue, 23 Aug 2016 14:11:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcGAj-0003DM-TO for qemu-devel@nongnu.org; Tue, 23 Aug 2016 14:11:38 -0400 Received: from qemu.weilnetz.de ([2a03:4000:2:362::1]:47061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcGAj-00039X-Mc for qemu-devel@nongnu.org; Tue, 23 Aug 2016 14:11:37 -0400 Received: by qemu.weilnetz.de (Postfix, from userid 1000) id CF69017F6C3; Tue, 23 Aug 2016 20:11:23 +0200 (CEST) From: Stefan Weil To: QEMU Developer Date: Tue, 23 Aug 2016 20:11:16 +0200 Message-Id: <1471975876-23385-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a03:4000:2:362::1 Subject: [Qemu-devel] [PATCH for-2.7] wxx: Fix broken build (mkdtemp unavailable) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Weil , Sascha Silbe Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 50455700092412d90ffaf57ee5d00f38f7d1cc5b added new code which does not compile for Windows. Signed-off-by: Stefan Weil --- include/glib-compat.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/glib-compat.h b/include/glib-compat.h index 8d5a7f3..3e025ca 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -48,6 +48,7 @@ static inline gint64 qemu_g_get_monotonic_time(void) gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout); #endif +#if !defined(_WIN32) #if !GLIB_CHECK_VERSION(2, 30, 0) /* Not a 100% compatible implementation, but good enough for most * cases. Placeholders are only supported at the end of the @@ -65,8 +66,10 @@ static inline gchar *qemu_g_dir_make_tmp(gchar const *tmpl, GError **error) g_free(path); return NULL; } + #define g_dir_make_tmp(tmpl, error) qemu_g_dir_make_tmp(tmpl, error) #endif /* glib 2.30 */ +#endif /* !_WIN32 */ #if !GLIB_CHECK_VERSION(2, 31, 0) /* before glib-2.31, GMutex and GCond was dynamic-only (there was a separate