From df81d7a374078c02d341fb3d55799d57ec4bdc61 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 13 Apr 2017 12:29:39 +0200 Subject: [PATCH] demo: adapt to GCC 6 Issue #2372 --- repos/demo/lib/mk/libpng_static.mk | 2 +- repos/demo/src/lib/mini_c/mini_c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/demo/lib/mk/libpng_static.mk b/repos/demo/lib/mk/libpng_static.mk index 6b7b4c4aa..313e23bad 100644 --- a/repos/demo/lib/mk/libpng_static.mk +++ b/repos/demo/lib/mk/libpng_static.mk @@ -5,7 +5,7 @@ SRC_C = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c pngread.c \ CC_OPT += -nostdinc -funroll-loops -DPNG_USER_CONFIG LIBS = mini_c libz_static -CC_WARN = -Wall -Wno-address +CC_WARN = -Wall -Wno-address -Wno-misleading-indentation vpath % $(REP_DIR)/src/lib/libpng/contrib diff --git a/repos/demo/src/lib/mini_c/mini_c.c b/repos/demo/src/lib/mini_c/mini_c.c index 6f19cf1d8..d6d6b4716 100644 --- a/repos/demo/src/lib/mini_c/mini_c.c +++ b/repos/demo/src/lib/mini_c/mini_c.c @@ -70,7 +70,7 @@ char *strcpy(char *dest, const char *src) char *strcat(char *dest, const char *src) { printf("%s: not implemented\n", __func__); return 0; } -inline size_t min(size_t v1, size_t v2) { return v1 < v2 ? v1 : v2; } +static inline size_t min(size_t v1, size_t v2) { return v1 < v2 ? v1 : v2; } char *strncpy(char *dst, const char *src, size_t n) {