From 574a7ff80b7a5c73e0993a25ef7996f83eee0d45 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Wed, 14 Oct 2015 16:06:30 +0200 Subject: minor Clang and OS X compilation fixes * we cannot use G_N_ELEMENTS in attribute declarations with Clang unless declaring C++11. In this case, since the size of the orig_color_table is fixed anyway, the declaration was simply fixed. * some reordering was necessary in cmdline.cpp. This should not have any influence on GCC when optimizations are enabled. * Scintilla/Scinterm had to be updated as well. --- src/interface-curses.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/interface-curses.h') diff --git a/src/interface-curses.h b/src/interface-curses.h index 6116cae..e3bbbf5 100644 --- a/src/interface-curses.h +++ b/src/interface-curses.h @@ -96,7 +96,7 @@ typedef class InterfaceCurses : public Interface { */ struct { short r, g, b; - } orig_color_table[G_N_ELEMENTS(color_table)]; + } orig_color_table[16]; int stdout_orig, stderr_orig; SCREEN *screen; -- cgit v1.2.3