From: Robin Dunn <robin@alldunn.com>
Date: Tue, 14 Mar 2006 01:40:05 +0000 (+0000)
Subject: Silence some warnings
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c099c54cbaa285c452468419f2021899553ff9b3

Silence some warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/contrib/src/stc/scintilla/include/Scintilla.h b/contrib/src/stc/scintilla/include/Scintilla.h
index b4ed329f72..4fb9ec338b 100644
--- a/contrib/src/stc/scintilla/include/Scintilla.h
+++ b/contrib/src/stc/scintilla/include/Scintilla.h
@@ -11,7 +11,7 @@
 #ifndef SCINTILLA_H
 #define SCINTILLA_H
 
-#if LCCWIN
+#if defined(LCCWIN) && LCCWIN
 typedef BOOL bool;
 #endif
 
@@ -25,7 +25,7 @@ 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 _MSC_VER >= 1300
+#if defined(_MSC_VER) && _MSC_VER >= 1300
 #include <BaseTsd.h>
 #endif
 #ifdef MAXULONG_PTR
diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
index b4ed329f72..4fb9ec338b 100644
--- a/src/stc/scintilla/include/Scintilla.h
+++ b/src/stc/scintilla/include/Scintilla.h
@@ -11,7 +11,7 @@
 #ifndef SCINTILLA_H
 #define SCINTILLA_H
 
-#if LCCWIN
+#if defined(LCCWIN) && LCCWIN
 typedef BOOL bool;
 #endif
 
@@ -25,7 +25,7 @@ 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 _MSC_VER >= 1300
+#if defined(_MSC_VER) && _MSC_VER >= 1300
 #include <BaseTsd.h>
 #endif
 #ifdef MAXULONG_PTR