From patchwork Sun Jul 8 12:23:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 169639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 79EC52C0212 for ; Sun, 8 Jul 2012 22:23:11 +1000 (EST) Received: from localhost ([::1]:47757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SnqW5-0001eb-8S for incoming@patchwork.ozlabs.org; Sun, 08 Jul 2012 08:23:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SnqVq-0001Tw-MB for qemu-devel@nongnu.org; Sun, 08 Jul 2012 08:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SnqVo-0001a1-Sz for qemu-devel@nongnu.org; Sun, 08 Jul 2012 08:22:54 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:56941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SnqVo-0001ZR-LW for qemu-devel@nongnu.org; Sun, 08 Jul 2012 08:22:52 -0400 Received: by mail-ee0-f45.google.com with SMTP id d41so5411240eek.4 for ; Sun, 08 Jul 2012 05:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=RFcc/M+Kwr79iNQTBnejfyWlgQ0pXbHlKEUGoh5K0xA=; b=GJIEI2w1uMndDU6wyeEUtvpRIPLblkONYt+t2hbISu6q6+NOKKDXhhH3cpHroDxKDK 7RE/04ktQYVwAUVylzammbiE4m6+1VMPsUG5mQHr5UN+XoDFN1/gQ10b65RbewV30Rb7 LfCREB2/GwH4KXnNyfYWoX0gyufCWecPKUAOs5W3VnFvSNwPMETJWpAxBqTGXOEC8Vvo Kx1Fe3thuUsJqUaxV5b/BcROJWpDFApKd/PS7xov1aY322q5PmUhwIh5NhSU7RrSApNj Q3bxAqr7GvCsioz9quCGya688aym8iZbYe/1gJ3KsjNd/K+4dCSqncsuAgOTXTE2WiuC M74g== Received: by 10.14.99.201 with SMTP id x49mr7087259eef.142.1341750171722; Sun, 08 Jul 2012 05:22:51 -0700 (PDT) Received: from localhost.localdomain (blueswirl.broker.freenet6.net. [2001:5c0:1400:b::d5a3]) by mx.google.com with ESMTPS id e48sm85537894eea.12.2012.07.08.05.22.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 Jul 2012 05:22:51 -0700 (PDT) From: blauwirbel@gmail.com To: qemu-devel@nongnu.org Date: Sun, 8 Jul 2012 12:23:05 +0000 Message-Id: <9e0182964235bf9670eb3b7c1800c75cb0dbff27.1341749912.git.blauwirbel@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.83.45 Cc: blueswirl@gmail.com Subject: [Qemu-devel] [PATCH v2 5/5] Avoid redefining inline X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Blue Swirl System headers (e.g. gutils.h) may define 'inline', #undefine it before #defining. Signed-off-by: Blue Swirl --- osdep.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/osdep.h b/osdep.h index 3ea4af0..1e15a4b 100644 --- a/osdep.h +++ b/osdep.h @@ -70,10 +70,12 @@ typedef signed int int_fast16_t; #ifndef always_inline #if !((__GNUC__ < 3) || defined(__APPLE__)) #ifdef __OPTIMIZE__ +#undef inline #define inline __attribute__ (( always_inline )) __inline__ #endif #endif #else +#undef inline #define inline always_inline #endif