Skip to content

Commit

Permalink
Merge branch 'ss/nedmalloc-compilation'
Browse files Browse the repository at this point in the history
* ss/nedmalloc-compilation:
  nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
  • Loading branch information
gitster committed Jan 3, 2013
2 parents cd46f2e + 8e679e0 commit 0266f46
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion compat/nedmalloc/nedmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,10 @@ static NOINLINE mstate FindMSpace(nedpool *p, threadcache *tc, int *lastUsed, si
}
/* We really want to make sure this goes into memory now but we
have to be careful of breaking aliasing rules, so write it twice */
*((volatile struct malloc_state **) &p->m[end])=p->m[end]=temp;
{
volatile struct malloc_state **_m=(volatile struct malloc_state **) &p->m[end];
*_m=(p->m[end]=temp);
}
ACQUIRE_LOCK(&p->m[end]->mutex);
/*printf("Created mspace idx %d\n", end);*/
RELEASE_LOCK(&p->mutex);
Expand Down

0 comments on commit 0266f46

Please sign in to comment.