Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert MinGW -std=c++{98,11} fix for Scintilla.

Browse Source 
This reverts part of the commit cc774bb301 which
is not necessary any longer with the latest Scintilla version that doesn't use
isascii().
This commit is contained in:
Vadim Zeitlin
2015-06-15 01:34:17 +02:00
parent 28e80e5b58
commit 9ef5a3ca7b
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/stc/scintilla/include/Scintilla.h
View File

@@ -42,17 +42,6 @@ typedef long sptr_t;
typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
/* Workaround for building with MinGW (not MinGW-w64) in strict ANSI mode which
* is, notably, enabled by -std=c++NN options. */
#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) && defined(__STRICT_ANSI__)
/* Other headers included by an application using Scintilla might already
* define isascii() too, for the same reasons, try to play nicely with the. */
#ifndef isascii
inline int isascii(int c) { return !(c & ~0x7F); }
#define isascii isascii
#endif
#endif
/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */ /* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
#define INVALID_POSITION -1 #define INVALID_POSITION -1
#define SCI_START 2000 #define SCI_START 2000