diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2015-10-14 16:06:30 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2015-10-14 16:06:30 +0200 |
| commit | 574a7ff80b7a5c73e0993a25ef7996f83eee0d45 (patch) | |
| tree | 092b9c2fa823d584306226478e4c137a0b24f7a3 /src/interface-curses.h | |
| parent | 5cc0aeb15280903018e5e4dd00ab47c26d5f4e7c (diff) | |
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.
Diffstat (limited to 'src/interface-curses.h')
| -rw-r--r-- | src/interface-curses.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<InterfaceCurses, ViewCurses> { */ struct { short r, g, b; - } orig_color_table[G_N_ELEMENTS(color_table)]; + } orig_color_table[16]; int stdout_orig, stderr_orig; SCREEN *screen; |