Skip to content

Commit a2b3f56

Browse files
author
Jehan
committed
Boolean #define-s removed from json-c in 2017.
We don't need to #undef TRUE and FALSE before including json.h as this redefinition has been removed in upstream json-c. See json-c commit 0992aac61f8b087efd7094e9ac2b84fa9c040fcd. Note that it still works even if using an older json-c since the original code was alreadying #undef-ing these 2 values before redefining them. So that was anyway useless code and this change should work both with old or new json-c. Note: the previous code was still working fine when building on Linux, but not when cross-compiling on Windows. But this is the correct fix anyway. (cherry picked from commit f4fd974)
1 parent 0c07191 commit a2b3f56

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

mypaint-brush.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
#include "rng-double.h"
3636

3737
#ifdef HAVE_JSON_C
38-
// Allow the C99 define from json.h
39-
#undef TRUE
40-
#undef FALSE
4138
#include <json.h>
4239
#endif // HAVE_JSON_C
4340

0 commit comments

Comments
 (0)