Message ID | 20141023123202.GD19316@thinpad.lan.raisama.net |
---|---|
State | New |
Headers | show |
On 10/23/2014 04:32 PM, Eduardo Habkost wrote: > On Thu, Oct 23, 2014 at 10:35:47AM +0400, Michael Tokarev wrote: >> On 09/26/2014 11:46 PM, Eduardo Habkost wrote: >>> This series adds a missing include, kills a circular header dependency, and >>> avoid including qemu-common.h from a header to avoid new circular dependencies. >>> >>> Eduardo Habkost (3): >>> tests: Add missing include to test-bitops.c >>> bitops.h: Don't include qemu-common.h >>> bitmap.h: Don't include qemu-common.h >> >> Applied all 3 to -trivial, _finally_ :) > > Thanks! > > But applying the series after commit be4d57c1ea7f17b9cadb0150b330efd9b6026972 > breaks build, because now bitmap.h needs stdlib.h (for abort()). Can you > squash the following into patch 3/3? Heh. I already fixed it in local git, -- it become obvious right when I tried to verify the whole lot, -- I usually perform build tests after applying all patches, not after each of them (actually maybe this is not good, because this way I can't catch "intermediate" breakage which breaks git bisection). Yes, squashed it in. Thank you! /mjt > --- > include/qemu/bitmap.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h > index 955627f..f0273c9 100644 > --- a/include/qemu/bitmap.h > +++ b/include/qemu/bitmap.h > @@ -14,6 +14,7 @@ > > #include <glib.h> > #include <string.h> > +#include <stdlib.h> > > #include "qemu/osdep.h" > #include "qemu/bitops.h" >
diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h index 955627f..f0273c9 100644 --- a/include/qemu/bitmap.h +++ b/include/qemu/bitmap.h @@ -14,6 +14,7 @@ #include <glib.h> #include <string.h> +#include <stdlib.h> #include "qemu/osdep.h" #include "qemu/bitops.h"