X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3af5821cf964398265547e23341e50cb6f55c081..a63d48fa138e9eaa3079172ace9a804ba5b0415e:/src/common/encconv.cpp?ds=sidebyside

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index e3327c909a..6fbf324fbf 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
-#ifdef __BORLANDC__
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
 #include "../common/unictabl.inc"
 #else
 #include "unictabl.inc"
@@ -44,9 +44,9 @@ typedef char tchar;
 
 #ifdef __WXMAC__
 
-#include "ATSUnicode.h"
-#include "TextCommon.h"
-#include "TextEncodingConverter.h"
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
 
 #include "wx/fontutil.h"
 #include "wx/mac/private.h"  // includes mac headers
@@ -71,7 +71,7 @@ static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
     	    char s[2] ;
     	    s[1] = 0 ;
     	    ByteCount byteInLen, byteOutLen ;
-    	    for( char c = 255 ; c >= 128 ; --c )
+    	    for( unsigned char c = 255 ; c >= 128 ; --c )
     	    {
     	        s[0] = c ;
                 status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,