fix osx build

- add namespace to lexR
- fix name collision with osx headers in LexTeX

2 files changed, 6 insertions, 3 deletions

diff --git a/src/LexR.cxx b/src/LexR.cxx
index 439e3e56f..0ca45cfd0 100644
--- a/src/LexR.cxx
+++ b/src/LexR.cxx
@@ -21,6 +21,9 @@
 #include "Scintilla.h"
 #include "SciLexer.h"
 
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
 
 static inline bool IsAWordChar(const int ch) {
 	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
diff --git a/src/LexTeX.cxx b/src/LexTeX.cxx
index fb1df2423..e28857a35 100644
--- a/src/LexTeX.cxx
+++ b/src/LexTeX.cxx
@@ -280,14 +280,14 @@ static void ColouriseTeXDoc(
 }
 
 
-static inline bool isnumber(int ch) {
+static inline bool isNumber(int ch) {
 	return
       (ch == '0') || (ch == '1') || (ch == '2') || 
       (ch == '3') || (ch == '4') || (ch == '5') || 
       (ch == '6') || (ch == '7') || (ch == '8') || (ch == '9');
 }
 
-static inline bool iswordchar(int ch) {
+static inline bool isWordChar(int ch) {
 	return ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'));
 }
 
@@ -303,7 +303,7 @@ static int ParseTeXCommand(unsigned int pos, Accessor &styler, char *command)
   }
 
   // find end
-     while(iswordchar(ch) && !isnumber(ch) && ch!='_' && ch!='.' && length<100){
+     while(isWordChar(ch) && !isNumber(ch) && ch!='_' && ch!='.' && length<100){
           command[length]=ch;
           length++;
           ch=styler.SafeGetCharAt(pos+length+1);