diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-12-22 14:16:12 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-01-05 15:27:43 +1100 |
commit | c82f2e4638727e197b2d88dcdc94f0a23324d918 (patch) | |
tree | 028d1e7b4d2cfbfd11b391a4dc4dea199826dc60 | |
parent | b2f2d96acca8c0210bdeadbf87532be990a80a4f (diff) | |
download | blackbird-skiboot-c82f2e4638727e197b2d88dcdc94f0a23324d918.tar.gz blackbird-skiboot-c82f2e4638727e197b2d88dcdc94f0a23324d918.zip |
stdio: Fix default definition of pr_fmt
And change include order in libpore to avoid a compile failure
due to the default definition
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r-- | libc/include/stdio.h | 2 | ||||
-rw-r--r-- | 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 db5f1b05..5dc4502b 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 3163bc97..b609b0d6 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 <p8_delta_scan_rw.h> #include <p8_pore_api_custom.h> #include <p8_pore_table_gen_api.H> -#include <p8_delta_scan_rw.h> /* // io_image - pointer to SLW image |