| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 59f65235a7a690f50d1686e9977908c053697d8c Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 28 Aug 2018 22:59:13 -0700 |
| 4 | Subject: [PATCH] undefine macro before redefining |
| 5 | |
| 6 | Fixes |
| 7 | src/main.c:89:9: error: 'printf' macro redefined [-Werror,-Wmacro-redefined] |
| 8 | |
| 9 | Upstream-Stats: Submitted [https://github.com/civetweb/civetweb/pull/649] |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | src/main.c | 1 + |
| 13 | 1 file changed, 1 insertion(+) |
| 14 | |
| 15 | diff --git a/src/main.c b/src/main.c |
| 16 | index bbcb0aec..01191a3c 100644 |
| 17 | --- a/src/main.c |
| 18 | +++ b/src/main.c |
| 19 | @@ -86,6 +86,7 @@ |
| 20 | |
| 21 | #include "civetweb.h" |
| 22 | |
| 23 | +#undef printf |
| 24 | #define printf \ |
| 25 | DO_NOT_USE_THIS_FUNCTION__USE_fprintf /* Required for unit testing */ |
| 26 | |