[PATCH libdrm 11/24] intel: remove the drm_mm* symbol workarounds

Emil Velikov emil.l.velikov at gmail.com
Wed Apr 1 09:15:22 PDT 2015


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 at anholt.net>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 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



More information about the dri-devel mailing list