Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-28 16:38:55 +00:00
parent 5e99793eca
commit 84cefcb0eb
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/stc/scintilla/include/Scintilla.h
View File

@@ -11,19 +11,23 @@
#ifndef SCINTILLA_H #ifndef SCINTILLA_H
#define SCINTILLA_H #define SCINTILLA_H
#ifdef PLAT_WIN
#if PLAT_WIN #if PLAT_WIN
// Return false on failure: // Return false on failure:
bool Scintilla_RegisterClasses(void *hInstance); bool Scintilla_RegisterClasses(void *hInstance);
bool Scintilla_ReleaseResources(); bool Scintilla_ReleaseResources();
#endif #endif
#endif
int Scintilla_LinkLexers(); int Scintilla_LinkLexers();
// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to // 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. // hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
// May need to be changed for 64 bit platforms. // May need to be changed for 64 bit platforms.
#ifdef _MSC_VER
#if _MSC_VER >= 1300 #if _MSC_VER >= 1300
#include <BaseTsd.h> #include <BaseTsd.h>
#endif #endif
#endif
#ifdef MAXULONG_PTR #ifdef MAXULONG_PTR
typedef ULONG_PTR uptr_t; typedef ULONG_PTR uptr_t;
typedef LONG_PTR sptr_t; typedef LONG_PTR sptr_t;

4
src/stc/scintilla/include/Scintilla.h
View File

@@ -11,19 +11,23 @@
#ifndef SCINTILLA_H #ifndef SCINTILLA_H
#define SCINTILLA_H #define SCINTILLA_H
#ifdef PLAT_WIN
#if PLAT_WIN #if PLAT_WIN
// Return false on failure: // Return false on failure:
bool Scintilla_RegisterClasses(void *hInstance); bool Scintilla_RegisterClasses(void *hInstance);
bool Scintilla_ReleaseResources(); bool Scintilla_ReleaseResources();
#endif #endif
#endif
int Scintilla_LinkLexers(); int Scintilla_LinkLexers();
// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to // 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. // hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
// May need to be changed for 64 bit platforms. // May need to be changed for 64 bit platforms.
#ifdef _MSC_VER
#if _MSC_VER >= 1300 #if _MSC_VER >= 1300
#include <BaseTsd.h> #include <BaseTsd.h>
#endif #endif
#endif
#ifdef MAXULONG_PTR #ifdef MAXULONG_PTR
typedef ULONG_PTR uptr_t; typedef ULONG_PTR uptr_t;
typedef LONG_PTR sptr_t; typedef LONG_PTR sptr_t;