| Message ID | 1366906631-2680-1-git-send-email-emaste@freebsd.org |
|---|---|
| State | New |
| Headers | show |
On 25 April 2013 17:17, Ed Maste <emaste@freebsd.org> wrote: > sys/param.h was included to define __FreeBSD_version, but the conditional > using it was removed by commit d05ef160453e98546a4197496dc8a3cb2defac53 > (Brad Smith, "Allow clock_gettime() monotonic clock to be utilized on more > OS's"), so the include is no longer needed here. > > Signed-off-by: Ed Maste <emaste@freebsd.org> CCing qemu-trivial for this. (Our other use of __FreeBSD_version is preceded by a direct include of sys/param.h in translate-all.c.) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM > --- > include/qemu/timer.h | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > index c363190..9dd206c 100644 > --- a/include/qemu/timer.h > +++ b/include/qemu/timer.h > @@ -5,10 +5,6 @@ > #include "qemu/main-loop.h" > #include "qemu/notify.h" > > -#ifdef __FreeBSD__ > -#include <sys/param.h> > -#endif > - > /* timers */ > > #define SCALE_MS 1000000 > -- > 1.7.11.5 >
On 25 April 2013 12:59, Peter Maydell <peter.maydell@linaro.org> wrote: > (Our other use of __FreeBSD_version is preceded by a direct > include of sys/param.h in translate-all.c.) I noticed that one. It's checking for __FreeBSD_version >= 700104, which corresponds to a point in time a little before the 7.1 release. Since that's no longer supported the conditional can be removed at some point, although there's no urgency as it doesn't cause any trouble. The timer.h one resulted in a broken build, since it ended up bringing in a round_page macro definition which conflicted with a function of the same name in mac_{old,new}world.c.
Applied. Thanks. Regards, Anthony Liguori
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index c363190..9dd206c 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -5,10 +5,6 @@ #include "qemu/main-loop.h" #include "qemu/notify.h" -#ifdef __FreeBSD__ -#include <sys/param.h> -#endif - /* timers */ #define SCALE_MS 1000000
sys/param.h was included to define __FreeBSD_version, but the conditional using it was removed by commit d05ef160453e98546a4197496dc8a3cb2defac53 (Brad Smith, "Allow clock_gettime() monotonic clock to be utilized on more OS's"), so the include is no longer needed here. Signed-off-by: Ed Maste <emaste@freebsd.org> --- include/qemu/timer.h | 4 ---- 1 file changed, 4 deletions(-)