summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-03-31 20:22:50 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-04-28 11:18:43 +0100
commit8e76f63cc42c800a636f069da7be95fe8b1de82e (patch)
treee3a38e09e1214c899356506e697c264c96699168
parent7c7d1f3c9cb62a15bfcd3c163fe2cd3433a29d4d (diff)
intel: remove the drm_mm* symbol workarounds
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. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--intel/mm.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/intel/mm.h b/intel/mm.h
index 8a5235b0..a6ee1022 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