1 files changed, 9 insertions, 32 deletions
diff --git a/src/mesa/main/mm.h b/src/mesa/main/mm.h
index d2aa3777c3..9213b2ad34 100644
--- a/src/mesa/main/mm.h
+++ b/src/mesa/main/mm.h
@@ -35,45 +35,22 @@
 #include "imports.h"
 
 
-struct mem_block_t {
-  struct mem_block_t *next;
-  struct mem_block_t *heap;
+struct mem_block {
+  struct mem_block *next;
+  struct mem_block *heap;
   int ofs,size;
   int align;
   unsigned int free:1;
   unsigned int reserved:1;
 };
 
-typedef struct mem_block_t TMemBlock;
-
-typedef struct mem_block_t *PMemBlock;
-
-/* a heap is just the first block in a chain */
-typedef struct mem_block_t memHeap_t;
-
-
-/* XXX are these needed? */
-#if 0
-static INLINE int
-mmBlockSize(PMemBlock b)
-{
-   return b->size;
-}
-
-static INLINE int
-mmOffset(PMemBlock b)
-{
-   return b->ofs;
-}
-#endif
-
 
 
 /** 
  * input: total size in bytes
  * return: a heap pointer if OK, NULL if error
  */
-extern memHeap_t *mmInit(int ofs, int size);
+extern struct mem_block *mmInit(int ofs, int size);
 
 /**
  * Allocate 'size' bytes with 2^align2 bytes alignment,
@@ -85,7 +62,7 @@ extern memHeap_t *mmInit(int ofs, int size);
  *		startSearch = linear offset from start of heap to begin search
  * return: pointer to the allocated block, 0 if error
  */
-extern PMemBlock mmAllocMem(memHeap_t *heap, int size, int align2, 
+extern struct mem_block *mmAllocMem(struct mem_block *heap, int size, int align2, 
                             int startSearch);
 
 /**
@@ -93,23 +70,23 @@ extern PMemBlock mmAllocMem(memHeap_t *heap, int size, int align2,
  * input: pointer to a block
  * return: 0 if OK, -1 if error
  */
-extern int mmFreeMem(PMemBlock b);
+extern int mmFreeMem(struct mem_block *b);
 
 /**
  * Free block starts at offset
  * input: pointer to a heap, start offset
  * return: pointer to a block
  */
-extern PMemBlock mmFindBlock(memHeap_t *heap, int start);
+extern struct mem_block *mmFindBlock(struct mem_block *heap, int start);
 
 /**
  * destroy MM
  */
-extern void mmDestroy(memHeap_t *mmInit);
+extern void mmDestroy(struct mem_block *mmInit);
 
 /**
  * For debuging purpose.
  */
-extern void mmDumpMemInfo(const memHeap_t *mmInit);
+extern void mmDumpMemInfo(const struct mem_block *mmInit);
 
 #endif