diff options
| author | scaraveo <devnull@localhost> | 2007-06-04 20:42:04 +0000 |
|---|---|---|
| committer | scaraveo <devnull@localhost> | 2007-06-04 20:42:04 +0000 |
| commit | 0c80257e76f3c9e4b78ea5c73518f171938db14f (patch) | |
| tree | 3b9e6bdf3d0ca98be154d390a7cea855b59d0fd6 | |
| parent | e1968db795a82959db3da66e548a9ba482a3e36d (diff) | |
| download | scintilla-mirror-0c80257e76f3c9e4b78ea5c73518f171938db14f.tar.gz | |
fix osx build for new positioncache code
| -rw-r--r-- | macosx/ScintillaMacOSX.h | 1 | ||||
| -rw-r--r-- | macosx/makefile | 2 | ||||
| -rw-r--r-- | src/PositionCache.cxx | 4 | ||||
| -rw-r--r-- | src/PositionCache.h | 8 |
4 files changed, 14 insertions, 1 deletions
diff --git a/macosx/ScintillaMacOSX.h b/macosx/ScintillaMacOSX.h index 0f02042f5..ebeda834d 100644 --- a/macosx/ScintillaMacOSX.h +++ b/macosx/ScintillaMacOSX.h @@ -43,6 +43,7 @@ #include "CharClassify.h" #include "Decoration.h" #include "Document.h" +#include "PositionCache.h" #include "Editor.h" #include "SString.h" #include "ScintillaBase.h" diff --git a/macosx/makefile b/macosx/makefile index 0ddbb9ccc..eaf03d410 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -75,7 +75,7 @@ deps: $(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \ - CharClassify.o Decoration.o Document.o CallTip.o \ + CharClassify.o Decoration.o Document.o CallTip.o PositionCache.o \ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatMacOSX.o \ KeyMap.o LineMarker.o ScintillaMacOSX.o CellBuffer.o ViewStyle.o \ RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 01b8f68f1..13140b779 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -31,6 +31,10 @@ #include "Document.h" #include "PositionCache.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + static inline bool IsControlCharacter(int ch) { // iscntrl returns true for lots of chars > 127 which are displayable return ch >= 0 && ch < ' '; diff --git a/src/PositionCache.h b/src/PositionCache.h index b69956d2b..ec1014c96 100644 --- a/src/PositionCache.h +++ b/src/PositionCache.h @@ -8,6 +8,10 @@ #ifndef POSITIONCACHE_H #define POSITIONCACHE_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + static inline bool IsEOLChar(char ch) { return (ch == '\r') || (ch == '\n'); } @@ -151,4 +155,8 @@ inline bool IsSpaceOrTab(int ch) { return ch == ' ' || ch == '\t'; } +#ifdef SCI_NAMESPACE +} +#endif + #endif |