mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 23:06:09 +02:00
Code

Merge branch 'ss/nedmalloc-compilation' into maint 

* ss/nedmalloc-compilation:
  nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
This commit is contained in:
Junio C Hamano 2013-01-08 11:17:07 -08:00
parent abf3e84b18 8e679e08a6
commit b48b632cda
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compat/nedmalloc/nedmalloc.c
View File

@ -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);