diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-29 09:52:53 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-29 09:52:53 +1100 |
| commit | 6c254c94360737545f2817740c87569e22cac0b1 (patch) | |
| tree | 9cdea689a3a6a375759df34521a797e156dcbc82 /win32 | |
| parent | a4e351dba6b49de1a84b4eb6b2c2f21dfdb86613 (diff) | |
| download | scintilla-mirror-6c254c94360737545f2817740c87569e22cac0b1.tar.gz | |
Move suppression of Clang warning language-extension-token from makefile to only
C++ file that requires it.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 5 | ||||
| -rw-r--r-- | win32/makefile | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 3c29d5351..73ac50271 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -58,6 +58,11 @@ #define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 #endif +// __uuidof is a Microsoft extension but makes COM code neater, so disable warning +#if defined(__clang__) +#pragma clang diagnostic ignored "-Wlanguage-extension-token" +#endif + namespace Scintilla { UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage); diff --git a/win32/makefile b/win32/makefile index 87d18722b..e708549e0 100644 --- a/win32/makefile +++ b/win32/makefile @@ -16,8 +16,7 @@ LIBSCI = $(DIR_BIN)/libscintilla.a ifdef CLANG CXX = clang++ # Clang doesn't like omitting braces in array initialization but they just add noise, -# __uuidof is a Microsoft extension but makes COM code neater, -CLANG_OPTS = -Wno-missing-braces -Wno-language-extension-token +CLANG_OPTS = -Wno-missing-braces else # MinGW GCC LIBSMINGW = -lstdc++ |