From patchwork Sat Jul 14 13:04:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 171003 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 DEA7C2C00DA for ; Sat, 14 Jul 2012 23:04:51 +1000 (EST) Received: from localhost ([::1]:34564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sq21h-0000Sl-Su for incoming@patchwork.ozlabs.org; Sat, 14 Jul 2012 09:04:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sq21P-0000AL-W2 for qemu-devel@nongnu.org; Sat, 14 Jul 2012 09:04:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sq21P-0005mK-1l for qemu-devel@nongnu.org; Sat, 14 Jul 2012 09:04:31 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:54939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sq21O-0005mB-Rm for qemu-devel@nongnu.org; Sat, 14 Jul 2012 09:04:30 -0400 Received: by eekd41 with SMTP id d41so1511970eek.4 for ; Sat, 14 Jul 2012 06:04:30 -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=NKCr0DV8NYsNCvs4rVXHUkhEjch8QEtl9VrfMfqFDGI=; b=L5VA/81YuHEk3DCUz5fgKO3EzImj/wAYrRYQfHOxYMK7/VgaxfFgvyjwNcGsaTLuy/ DuU+WBHpDmeCmvaq2yF/CIWC3EjwmZAq0J4oRFEf+ogp9XNmSZkbCFDB9n90ETzkHFJN ZX/bvYvYxtXTskZwCo4iIY86tJfEOczWXitNhBBU7e7xnyg0sa7Vp6OsXvHf9scPRbzH EBqrvOtpz9/S+UHs24mSsLvYP3D9KwvbVjF04DuihUIIebnoWM9qPBf2D0YxcGqlYyFc Bl/BtYmeilmlnH2AKO84r6scTSa7OV/5QAVl1LJd/ljelMh1sx5tC3n/O3RXSYEbf1Sf rSBQ== Received: by 10.14.3.70 with SMTP id 46mr2036293eeg.21.1342271070112; Sat, 14 Jul 2012 06:04:30 -0700 (PDT) Received: from localhost.localdomain (blueswirl.broker.freenet6.net. [2001:5c0:1400:b::d5a3]) by mx.google.com with ESMTPS id j4sm3761273eeo.11.2012.07.14.06.04.28 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 14 Jul 2012 06:04:29 -0700 (PDT) From: Blue Swirl To: qemu-devel@nongnu.org Date: Sat, 14 Jul 2012 13:04:52 +0000 Message-Id: <564044c7363071b686f8f41e8c87300d635e64b2.1342270877.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: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH v3 2/2] 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 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