diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
| commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
| tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mesa/main/mm.c | |
| parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
| parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
| download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/mm.c')
| -rw-r--r-- | mesalib/src/mesa/main/mm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/mm.c b/mesalib/src/mesa/main/mm.c index ab32123a4..473e90fc2 100644 --- a/mesalib/src/mesa/main/mm.c +++ b/mesalib/src/mesa/main/mm.c @@ -65,11 +65,11 @@ mmInit(unsigned ofs, unsigned size) if (!size) return NULL; - heap = (struct mem_block *) calloc(1, sizeof(struct mem_block)); + heap = calloc(1, sizeof(struct mem_block)); if (!heap) return NULL; - block = (struct mem_block *) calloc(1, sizeof(struct mem_block)); + block = calloc(1, sizeof(struct mem_block)); if (!block) { free(heap); return NULL; @@ -103,7 +103,7 @@ SliceBlock(struct mem_block *p, /* break left [p, newblock, p->next], then p = newblock */ if (startofs > p->ofs) { - newblock = (struct mem_block*) calloc(1, sizeof(struct mem_block)); + newblock = calloc(1, sizeof(struct mem_block)); if (!newblock) return NULL; newblock->ofs = startofs; @@ -127,7 +127,7 @@ SliceBlock(struct mem_block *p, /* break right, also [p, newblock, p->next] */ if (size < p->size) { - newblock = (struct mem_block*) calloc(1, sizeof(struct mem_block)); + newblock = calloc(1, sizeof(struct mem_block)); if (!newblock) return NULL; newblock->ofs = startofs + size; |