From 186b3a2a5ef18898bc47b8e4a477c318e454cfff Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 2 Dec 2020 12:19:13 -0500 Subject: [PATCH] kill ifdefs via explitict initialization --- include/notcurses/notcurses.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/notcurses/notcurses.h b/include/notcurses/notcurses.h index abca25941..0d9aa9fe1 100644 --- a/include/notcurses/notcurses.h +++ b/include/notcurses/notcurses.h @@ -577,12 +577,7 @@ typedef struct cell { uint64_t channels; // + 8B == 16B } cell; -#ifdef __cplusplus -#define CELL_TRIVIAL_INITIALIZER { } -#else -#define CELL_TRIVIAL_INITIALIZER {0} -#endif - +#define CELL_TRIVIAL_INITIALIZER { .gcluster = 0, .gcluster_backstop = 0, .reserved = 0, .stylemask = 0, .channels = 0, } #define CELL_CHAR_INITIALIZER(c) { .gcluster = (htole(c)), .gcluster_backstop = 0, .reserved = 0, .stylemask = 0, .channels = 0, } #define CELL_INITIALIZER(c, s, chan) { .gcluster = (htole(c)), .gcluster_backstop = 0, .reserved = 0, .stylemask = (s), .channels = (chan), }