diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-21 07:44:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-21 07:44:54 -0300 |
| commit | 1fc6b0207cc2f3cce33817706603caa41a9de24d (patch) | |
| tree | d2d812b76b08f42a002621f716dd5f3199c7ca7d /contrib/gcclibs/include | |
| parent | b8632c4f34175c7018be77059ab229e755eb67e0 (diff) | |
| parent | bc9e0dd07a76c4d7a1c6fcf21824ca2cecff2c6d (diff) | |
| download | FreeBSD-src-1fc6b0207cc2f3cce33817706603caa41a9de24d.zip FreeBSD-src-1fc6b0207cc2f3cce33817706603caa41a9de24d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/gcclibs/include')
| -rw-r--r-- | contrib/gcclibs/include/objalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gcclibs/include/objalloc.h b/contrib/gcclibs/include/objalloc.h index 36772d1..e3cc7bb 100644 --- a/contrib/gcclibs/include/objalloc.h +++ b/contrib/gcclibs/include/objalloc.h @@ -1,5 +1,5 @@ /* objalloc.h -- routines to allocate memory for objects - Copyright 1997, 2001 Free Software Foundation, Inc. + Copyright 1997, 2001-2012 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Solutions. This program is free software; you can redistribute it and/or modify it @@ -91,7 +91,7 @@ extern void *_objalloc_alloc (struct objalloc *, unsigned long); if (__len == 0) \ __len = 1; \ __len = (__len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1); \ - (__len <= __o->current_space \ + (__len != 0 && __len <= __o->current_space \ ? (__o->current_ptr += __len, \ __o->current_space -= __len, \ (void *) (__o->current_ptr - __len)) \ |
