NS build broken

[Matthew Leach]

Hi all,

I'm trying to build current master (c9d238316c6a4bb1) on OSX 10.10.1.
It's failing when trying to compile macfont.m:

--8<---------------cut here---------------start------------->8---
  CC       macfont.o
macfont.m:226:53: warning: implicit conversion from enumeration type 
'CharacterCollection' (aka 'enum CTCharacterCollection') to different 
enumeration type 'NSCharacterCollection'
      (aka 'enum NSCharacterCollection') [-Wenum-conversion]
                                         collection:collection
                                                    ^~~~~~~~~~
macfont.m:1483:44: error: use of undeclared identifier 
'mac_uvs_table_adobe_japan1_bytes'; did you mean 'mac_uvs_table_adobe_japan1'?
                                           mac_uvs_table_adobe_japan1_bytes,
                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                           mac_uvs_table_adobe_japan1
macfont.m:1478:28: note: 'mac_uvs_table_adobe_japan1' declared here
          static CFDataRef mac_uvs_table_adobe_japan1 = NULL;
                           ^
macfont.m:1484:52: error: use of undeclared identifier 
'mac_uvs_table_adobe_japan1_bytes'; did you mean 'mac_uvs_table_adobe_japan1'?
                                           sizeof 
(mac_uvs_table_adobe_japan1_bytes),
                                                   
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                   mac_uvs_table_adobe_japan1
macfont.m:1478:28: note: 'mac_uvs_table_adobe_japan1' declared here
          static CFDataRef mac_uvs_table_adobe_japan1 = NULL;
                           ^
macfont.m:1483:44: warning: incompatible pointer types passing 'CFDataRef' (aka 
'const struct __CFData *') to parameter of type 'const UInt8 *' (aka 'const 
unsigned char *') [-Wincompatible-pointer-types]
                                           mac_uvs_table_adobe_japan1_bytes,
                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/System/Library/Frameworks/CoreFoundation.framework/Headers/CFData.h:23:78: 
note: passing argument to parameter 'bytes' here
CFDataRef CFDataCreateWithBytesNoCopy(CFAllocatorRef allocator, const UInt8 
*bytes, CFIndex length, CFAllocatorRef bytesDeallocator);
                                                                             ^
2 warnings and 2 errors generated.
--8<---------------cut here---------------end--------------->8---

Thanks,
-- 
Matt