From patchwork Sun Oct 19 00:00:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 400725 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1A27914007D for ; Sun, 19 Oct 2014 11:01:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751586AbaJSABn (ORCPT ); Sat, 18 Oct 2014 20:01:43 -0400 Received: from filtteri5.pp.htv.fi ([213.243.153.188]:57134 "EHLO filtteri5.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbaJSABn (ORCPT ); Sat, 18 Oct 2014 20:01:43 -0400 Received: from localhost (localhost [127.0.0.1]) by filtteri5.pp.htv.fi (Postfix) with ESMTP id D322D5A6DDE; Sun, 19 Oct 2014 03:01:07 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp5.welho.com ([213.243.153.39]) by localhost (filtteri5.pp.htv.fi [213.243.153.188]) (amavisd-new, port 10024) with ESMTP id JpFeImDslTih; Sun, 19 Oct 2014 03:00:52 +0300 (EEST) Received: from cooljazz.bb.dnainternet.fi (91-145-91-118.bb.dnainternet.fi [91.145.91.118]) by smtp5.welho.com (Postfix) with ESMTP id 1BD3F5BC005; Sun, 19 Oct 2014 03:01:00 +0300 (EEST) From: Aaro Koskinen To: sparclinux@vger.kernel.org Cc: Aaro Koskinen Subject: [PATCH 1/5] silo: ext2fs: delete INCLUDE_INLINE_FUNCS ifdeffery Date: Sun, 19 Oct 2014 03:00:49 +0300 Message-Id: <1413676853-23942-2-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413676853-23942-1-git-send-email-aaro.koskinen@iki.fi> References: <1413676853-23942-1-git-send-email-aaro.koskinen@iki.fi> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Delete INCLUDE_INLINE_FUNCS ifdeffery. Signed-off-by: Aaro Koskinen --- include/ext2fs/bitops.h | 6 +----- include/ext2fs/ext2fs.h | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/ext2fs/bitops.h b/include/ext2fs/bitops.h index 7e049d1..f8ce0fc 100644 --- a/include/ext2fs/bitops.h +++ b/include/ext2fs/bitops.h @@ -94,16 +94,12 @@ extern void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map); #endif #endif /* NO_INLINE_FUNCS */ -#if (defined(INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS)) -#ifdef INCLUDE_INLINE_FUNCS -#define _INLINE_ extern -#else +#if !defined(NO_INLINE_FUNCS) #ifdef __GNUC__ #define _INLINE_ extern __inline__ #else /* For Watcom C */ #define _INLINE_ extern inline #endif -#endif #if ((defined __GNUC__) && (defined(__i386__) || defined(__i486__) || \ defined(__i586__))) diff --git a/include/ext2fs/ext2fs.h b/include/ext2fs/ext2fs.h index 17481a0..b88e3a4 100644 --- a/include/ext2fs/ext2fs.h +++ b/include/ext2fs/ext2fs.h @@ -877,16 +877,12 @@ extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs, * If NO_INLINE_FUNCS is defined, then we won't try to do inline * functions at all! */ -#if (defined(INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS)) -#ifdef INCLUDE_INLINE_FUNCS -#define _INLINE_ extern -#else +#if !defined(NO_INLINE_FUNCS) #ifdef __GNUC__ #define _INLINE_ extern __inline__ #else /* For Watcom C */ #define _INLINE_ extern inline #endif -#endif #ifndef EXT2_CUSTOM_MEMORY_ROUTINES /*