use #ifdef and not #if (fixes -Wundef warnings reported in bug 1273111)

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

diff --git a/contrib/src/stc/scintilla/include/Scintilla.h b/contrib/src/stc/scintilla/include/Scintilla.h
index f20f0de22dec345a0545f6bc95a0958a3b545bc4..fb6c674a7ad84bf29d41e68ea350a830004a0585 100644 (file)
--- a/contrib/src/stc/scintilla/include/Scintilla.h
+++ b/contrib/src/stc/scintilla/include/Scintilla.h
@@ -11,19 +11,23 @@
 #ifndef SCINTILLA_H
 #define SCINTILLA_H
 
+#ifdef PLAT_WIN
 #if PLAT_WIN
 // Return false on failure:
 bool Scintilla_RegisterClasses(void *hInstance);
 bool Scintilla_ReleaseResources();
 #endif
+#endif
 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.
+#ifdef _MSC_VER
 #if _MSC_VER >= 1300
 #include <BaseTsd.h>
 #endif
+#endif
 #ifdef MAXULONG_PTR
 typedef ULONG_PTR uptr_t;
 typedef LONG_PTR sptr_t;

diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
index f20f0de22dec345a0545f6bc95a0958a3b545bc4..fb6c674a7ad84bf29d41e68ea350a830004a0585 100644 (file)
--- a/src/stc/scintilla/include/Scintilla.h
+++ b/src/stc/scintilla/include/Scintilla.h
@@ -11,19 +11,23 @@
 #ifndef SCINTILLA_H
 #define SCINTILLA_H
 
+#ifdef PLAT_WIN
 #if PLAT_WIN
 // Return false on failure:
 bool Scintilla_RegisterClasses(void *hInstance);
 bool Scintilla_ReleaseResources();
 #endif
+#endif
 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.
+#ifdef _MSC_VER
 #if _MSC_VER >= 1300
 #include <BaseTsd.h>
 #endif
+#endif
 #ifdef MAXULONG_PTR
 typedef ULONG_PTR uptr_t;
 typedef LONG_PTR sptr_t;