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 | a0d074425813daed19550b909275fd68f43975cf (patch) | |
| tree | 86a90a214dddd5808d01a745916e19d1ea97b2e3 | |
| parent | 0e8b84a8747b9fe382bc291b1f07830363ca8c74 (diff) | |
| download | scintilla-mirror-a0d074425813daed19550b909275fd68f43975cf.tar.gz | |
Backport: Move suppression of Clang warning language-extension-token from makefile to only
C++ file that requires it.
Backport of changeset 7844:bb2bc0e7f17a.
| -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 14516d30e..44e758698 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 56aed0ba0..54eb0c587 100644 --- a/win32/makefile +++ b/win32/makefile @@ -16,9 +16,8 @@ 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, # public visibility avoids warnings like 'locally defined symbol __std_terminate imported' -CLANG_OPTS = -Wno-missing-braces -Wno-language-extension-token -Xclang -flto-visibility-public-std +CLANG_OPTS = -Wno-missing-braces -Xclang -flto-visibility-public-std else # MinGW GCC LIBSMINGW = -lstdc++ |