[HarfBuzz] harfbuzz-ng: Branch 'master' - 7 commits

[Jonathan Kew]

On 24 May 2010, at 19:34, Jonathan Kew wrote:

> On 24 May 2010, at 19:28, Jonathan Kew wrote:
> 
>> Hi Behdad (or Martin),
>> 
>> It looks like things are currently (80af2812fb3b231ddcb4608ec13c6038a681c818) a little broken with regard to #includes....
>> 
>> First, hb-shape.cc fails to compile because hb_ot_shape() has not been declared; it needs to #include "hb-ot-shape.h".
>> 
>> And second, hb-ot.h is a public C-language header and as such, it should not include hb-ot-shape-private.hh, which is a private C++-language file. Changing hb-ot.h to include hb-ot-shape.h instead seems to resolve this.
> 
> And third, hb-ot-shape.cc needs to #include "hb-ot-shape.h", so that the hb_ot_shape() function gets defined with the proper linkage.
> 
> So altogether, the fixes I did to get my build to work are in the attached patch.

And one more thing - all the references to hb-ot-shape-private.hh (in other source files, and in Makefile.am) need to be removed.

JK