diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-08 19:17:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 19:17:07 (GMT) |
| commit | b48b632cda2d8f74524c448027e867089ddcb44a (patch) | |
| tree | cb041b5d7bc58afabced21c9a86ac8f334a079c4 /compat | |
| parent | abf3e84b185524aa7903337846578b1486a52758 (diff) | |
| parent | 8e679e08a6e12e183aeb068a2ff5d75599d6433d (diff) | |
| download | git-b48b632cda2d8f74524c448027e867089ddcb44a.zip git-b48b632cda2d8f74524c448027e867089ddcb44a.tar.gz git-b48b632cda2d8f74524c448027e867089ddcb44a.tar.bz2 | |
Merge branch 'ss/nedmalloc-compilation' into maint
* ss/nedmalloc-compilation:
nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/nedmalloc/nedmalloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c index d9a17a8..91c4e7f 100644 --- a/compat/nedmalloc/nedmalloc.c +++ b/compat/nedmalloc/nedmalloc.c @@ -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); |