From: Junio C Hamano Date: Fri, 28 Oct 2016 16:01:18 +0000 (-0700) Subject: Merge branch 'jk/tighten-alloc' into maint X-Git-Tag: v2.10.2~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/63cf124c2436722d70c28fc12f9337e9938091ef?ds=inline;hp=--cc Merge branch 'jk/tighten-alloc' into maint Protect our code from over-eager compilers. * jk/tighten-alloc: inline xalloc_flex() into FLEXPTR_ALLOC_MEM avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM --- 63cf124c2436722d70c28fc12f9337e9938091ef