From 84cefcb0eb3b04bf3b94a799462a235446493e50 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 28 Aug 2005 16:38:55 +0000 Subject: [PATCH] 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 --- contrib/src/stc/scintilla/include/Scintilla.h | 4 ++++ src/stc/scintilla/include/Scintilla.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/contrib/src/stc/scintilla/include/Scintilla.h b/contrib/src/stc/scintilla/include/Scintilla.h index f20f0de22d..fb6c674a7a 100644 --- 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 #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 f20f0de22d..fb6c674a7a 100644 --- 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 #endif +#endif #ifdef MAXULONG_PTR typedef ULONG_PTR uptr_t; typedef LONG_PTR sptr_t; -- 2.45.2