From 9ef5a3ca7b9fd9948de21227c9f302cb5f42009b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 15 Jun 2015 01:34:17 +0200 Subject: [PATCH] Revert MinGW -std=c++{98,11} fix for Scintilla. This reverts part of the commit cc774bb3016813e67591c019d716f8e0861f8bb9 which is not necessary any longer with the latest Scintilla version that doesn't use isascii(). --- src/stc/scintilla/include/Scintilla.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h index 3cc7dd1bf7..22d36d34d9 100644 --- a/src/stc/scintilla/include/Scintilla.h +++ b/src/stc/scintilla/include/Scintilla.h @@ -42,17 +42,6 @@ typedef long sptr_t; 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 */ #define INVALID_POSITION -1 #define SCI_START 2000