From patchwork Thu Dec 22 03:16:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 708060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tkcCy5N1Pz9t10 for ; Thu, 22 Dec 2016 14:18:06 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tkcCy4RSYzDwZJ for ; Thu, 22 Dec 2016 14:18:06 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tkcCj3PhCzDqTB for ; Thu, 22 Dec 2016 14:17:52 +1100 (AEDT) Received: from pasglop.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id uBM3HLtq004281; Wed, 21 Dec 2016 21:17:36 -0600 From: Benjamin Herrenschmidt To: skiboot@lists.ozlabs.org Date: Thu, 22 Dec 2016 14:16:12 +1100 Message-Id: <20161222031708.18752-4-benh@kernel.crashing.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161222031708.18752-1-benh@kernel.crashing.org> References: <20161222031708.18752-1-benh@kernel.crashing.org> Subject: [Skiboot] [PATCH 04/60] stdio: Fix default definition of pr_fmt X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" And change include order in libpore to avoid a compile failure due to the default definition Signed-off-by: Benjamin Herrenschmidt --- libc/include/stdio.h | 2 +- libpore/p8_pore_table_gen_api_fixed.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libc/include/stdio.h b/libc/include/stdio.h index db5f1b0..5dc4502 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -44,7 +44,7 @@ int fileno(FILE *stream); int _printf(const char *format, ...) __attribute__((format (printf, 1, 2))); #ifndef pr_fmt -#define prfmt(fmt) fmt +#define pr_fmt(fmt) fmt #endif #define printf(f, ...) do { _printf(pr_fmt(f), ##__VA_ARGS__); } while(0) diff --git a/libpore/p8_pore_table_gen_api_fixed.C b/libpore/p8_pore_table_gen_api_fixed.C index 3163bc9..b609b0d 100644 --- a/libpore/p8_pore_table_gen_api_fixed.C +++ b/libpore/p8_pore_table_gen_api_fixed.C @@ -40,9 +40,9 @@ /*------------------------------------------------------------------------------*/ #define __P8_PORE_TABLE_GEN_API_C +#include #include #include -#include /* // io_image - pointer to SLW image