Humble ping. Eric, can you please confirm if this and the follow up patch look ok. Thanks Emil On 1 April 2015 at 17:15, Emil Velikov <emil.l.velikov@xxxxxxxxx> wrote: > Added with commit 57b4c4c32d3(Move the renaming of mm.c symbols to > symbol duplication/collision with ones that are available elsewhere. > > As the public/private symbols of libdrm are properly annotated neither > one of the symbols will end up in the global name-space, thus should no > longer be required. > > Eric, > Does this sound correct, or there is something more subtle in there ? > > Cc: Eric Anholt <eric@xxxxxxxxxx> > Signed-off-by: Emil Velikov <emil.l.velikov@xxxxxxxxx> > --- > intel/mm.h | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/intel/mm.h b/intel/mm.h > index 8a5235b..a6ee102 100644 > --- a/intel/mm.h > +++ b/intel/mm.h > @@ -38,16 +38,6 @@ struct mem_block { > unsigned int reserved:1; > }; > > -/* Rename the variables in the drm copy of this code so that it doesn't > - * conflict with mesa or whoever else has copied it around. > - */ > -#define mmInit drm_mmInit > -#define mmAllocMem drm_mmAllocMem > -#define mmFreeMem drm_mmFreeMem > -#define mmFindBlock drm_mmFindBlock > -#define mmDestroy drm_mmDestroy > -#define mmDumpMemInfo drm_mmDumpMemInfo > - > /** > * input: total size in bytes > * return: a heap pointer if OK, NULL if error > -- > 2.3.1 > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel