From 8653e1e7803090103c72a094b12b385322f192d9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 19 Jan 2009 14:43:09 +0000 Subject: [PATCH] use basetsd.h for non-MSVC compilers (including mingw32 too), replaces the previous fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/stc/scintilla/include/Scintilla.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h index 1c4beca699..3201d16806 100644 --- a/src/stc/scintilla/include/Scintilla.h +++ b/src/stc/scintilla/include/Scintilla.h @@ -25,14 +25,10 @@ int Scintilla_LinkLexers(); // Here should be placed typedefs for uptr_t, an unsigned integer type large enough to // hold a pointer and sptr_t, a signed integer large enough to hold a pointer. // May need to be changed for 64 bit platforms. -#if defined(_MSC_VER) && _MSC_VER >= 1300 +#ifdef _WIN32 #include #endif -#if defined(__MINGW64__) -#include -typedef uint64_t uptr_t; -typedef int64_t sptr_t; -#elif defined(MAXULONG_PTR) +#ifdef MAXULONG_PTR typedef ULONG_PTR uptr_t; typedef LONG_PTR sptr_t; #else -- 2.45.2