X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/682f3d0207027e96c34cc5a2f1e8311c4d370ba6..867f2ca48e6c653ed3f1c29677e283428bcf90c3:/src/common/encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 8a16e004f4..d6d4dd5a54 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -18,8 +18,6 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FONTMAP
-
 #include "wx/encconv.h"
 
 #include <stdlib.h>
@@ -38,10 +36,13 @@
 #endif
 
 #ifdef __WXMAC__
-    #include <ATSUnicode.h>
-    #include <TextCommon.h>
-    #include <TextEncodingConverter.h>
-
+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif
     #include "wx/fontutil.h"
     #include "wx/mac/private.h"  // includes mac headers
 
@@ -530,4 +531,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     return arr;
 }
 
-#endif // wxUSE_FONTMAP