Commit 7843a14d authored by Ian Lance Taylor's avatar Ian Lance Taylor

Remove duplicate typedef declarations.

R=rsc
DELTA=7  (0 added, 7 deleted, 0 changed)
OCL=22267
CL=22281
parent cb13c4d5
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
typedef struct FixAlloc FixAlloc; typedef struct FixAlloc FixAlloc;
typedef struct MCentral MCentral; typedef struct MCentral MCentral;
typedef struct MCache MCache;
typedef struct MHeap MHeap; typedef struct MHeap MHeap;
typedef struct MHeapMap MHeapMap; typedef struct MHeapMap MHeapMap;
typedef struct MHeapMapCache MHeapMapCache; typedef struct MHeapMapCache MHeapMapCache;
...@@ -148,7 +147,6 @@ void FixAlloc_Free(FixAlloc *f, void *p); ...@@ -148,7 +147,6 @@ void FixAlloc_Free(FixAlloc *f, void *p);
// Statistics. // Statistics.
// Shared with Go: if you edit this structure, also edit ../lib/malloc.go. // Shared with Go: if you edit this structure, also edit ../lib/malloc.go.
typedef struct MStats MStats;
struct MStats struct MStats
{ {
uint64 alloc; uint64 alloc;
...@@ -228,7 +226,6 @@ void MSpanList_Remove(MSpan *span); // from whatever list it is in ...@@ -228,7 +226,6 @@ void MSpanList_Remove(MSpan *span); // from whatever list it is in
// Central list of free objects of a given size. // Central list of free objects of a given size.
typedef struct MCentral MCentral;
struct MCentral struct MCentral
{ {
Lock; Lock;
...@@ -256,7 +253,6 @@ void MCentral_FreeList(MCentral *c, int32 n, MLink *first); ...@@ -256,7 +253,6 @@ void MCentral_FreeList(MCentral *c, int32 n, MLink *first);
// On the other hand, it's just virtual address space: most of // On the other hand, it's just virtual address space: most of
// the memory is never going to be touched, thus never paged in. // the memory is never going to be touched, thus never paged in.
typedef struct MHeapMap MHeapMap;
typedef struct MHeapMapNode2 MHeapMapNode2; typedef struct MHeapMapNode2 MHeapMapNode2;
typedef struct MHeapMapNode3 MHeapMapNode3; typedef struct MHeapMapNode3 MHeapMapNode3;
...@@ -319,7 +315,6 @@ enum ...@@ -319,7 +315,6 @@ enum
MHeapMapCache_HashBits = 12 MHeapMapCache_HashBits = 12
}; };
typedef struct MHeapMapCache MHeapMapCache;
struct MHeapMapCache struct MHeapMapCache
{ {
uintptr array[1<<MHeapMapCache_HashBits]; uintptr array[1<<MHeapMapCache_HashBits];
...@@ -341,7 +336,6 @@ struct MHeapMapCache ...@@ -341,7 +336,6 @@ struct MHeapMapCache
// Main malloc heap. // Main malloc heap.
// The heap itself is the "free[]" and "large" arrays, // The heap itself is the "free[]" and "large" arrays,
// but all the other global data is here too. // but all the other global data is here too.
typedef struct MHeap MHeap;
struct MHeap struct MHeap
{ {
Lock; Lock;
...@@ -370,4 +364,3 @@ void MHeap_Init(MHeap *h, void *(*allocator)(uintptr)); ...@@ -370,4 +364,3 @@ void MHeap_Init(MHeap *h, void *(*allocator)(uintptr));
MSpan* MHeap_Alloc(MHeap *h, uintptr npage, int32 sizeclass); MSpan* MHeap_Alloc(MHeap *h, uintptr npage, int32 sizeclass);
void MHeap_Free(MHeap *h, MSpan *s); void MHeap_Free(MHeap *h, MSpan *s);
MSpan* MHeap_Lookup(MHeap *h, PageID p); MSpan* MHeap_Lookup(MHeap *h, PageID p);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment