To be honest, I am perplexed by this amalgamation exercise. All of this apparently needed because some obscure "in-house" tool does not know how to resolve the name conflicts.
Teach the damn tool how to resolve the name conflicts by adding prefixes or suffixes! Why do you butcher perfectly legal code C-code? You problem is in the tool - not it in FreeType. On Mon, Feb 20, 2012 at 1:13 PM, Vinnie <thev...@yahoo.com> wrote: >>From: Werner LEMBERG <w...@gnu.org> >>Subject: Re: [ft-devel] FreeType Amalgamation >> >>Indeed. Can you provide patches, splitting the discussed issues into >>logical change sets so that I can easily add them to the git >>repository? > > > Yes. So far there are 6 sets of changes, using the naming conventions that > you recommended. These patches were created off an unmodified copy of the > publicly available FreeType 2.4.8. Unfortunately I'm using SVN but the > patches should still be applicable (?) > > The patches are numbered according to the change log entry: > > 2012-02-20 Vinnie Falco <vinnie.fa...@gmail.com> > [1] ftgrays.c, ftraster.c: Rename TBand* > [2] ftgrays.c, ftraster:c: Undefined FLOOR, CEILING, TRUNC, SCALED > [3] ftgrays.c, ftraster.c: Rename [T,P]Worker* > [4] ftgrays.c, ftraster.c: Rename RAS_ARG* and [P,T]Raster > [5] fterrors.h: Conditionally undefine FT_KEEP_ERR_PREFIX > tterrors.h: Undefine FT_ERR_PREFIX > [6] ttdriver.c, cffdriver.c: Rename Load_Glyph > t1cmap.c, t1driver.c: Rename t1_get_glyph_name > cidload.c: Rename t1_init_loader, t1_done_loader > cidload.c, t1load.c: Rename parse_font_matrix > > I need to work on the amalgamation tool a little more to support inclusion of > fterrdef.h multiple times, and then do some testing. > > Thanks, > > Vinnie > > _______________________________________________ > Freetype-devel mailing list > Freetype-devel@nongnu.org > https://lists.nongnu.org/mailman/listinfo/freetype-devel > -- Alexei A. Podtelezhnikov, PhD _______________________________________________ Freetype-devel mailing list Freetype-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/freetype-devel
