Use wxASSERT() instead of assert() in wx code.

[wxWidgets.git] / src / stc / scintilla / include / Scintilla.h

diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
index 1c4beca699f04dbb82304543e9ed5c4af492e366..36aed76b8eef3d93f246d603dd99b8d7b32a9e11 100644 (file)
--- 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
-#include <BaseTsd.h>
+#ifdef _WIN32
+#include <windows.h>
 #endif
-#if defined(__MINGW64__)
-#include <stdint.h>
-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