[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 03/14] disas/arm-a64.cc: Include osdep.h first
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PATCH 03/14] disas/arm-a64.cc: Include osdep.h first |
Date: |
Thu, 18 Feb 2016 15:49:51 +0000 |
On 9 February 2016 at 15:25, Peter Maydell <address@hidden> wrote:
> Rearrange include directives so that we include osdep.h first.
> This has to be done manually because clean-includes doesn't
> handle C++.
>
> Signed-off-by: Peter Maydell <address@hidden>
> ---
> disas/arm-a64.cc | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
> index d4d46d5..9280950 100644
> --- a/disas/arm-a64.cc
> +++ b/disas/arm-a64.cc
> @@ -17,12 +17,13 @@
> * along with this program. If not, see <http://www.gnu.org/licenses/>.
> */
>
> -#include "vixl/a64/disasm-a64.h"
> -
> extern "C" {
> +#include "qemu/osdep.h"
> #include "disas/bfd.h"
> }
>
> +#include "vixl/a64/disasm-a64.h"
> +
> using namespace vixl;
>
> static Decoder *vixl_decoder = NULL;
So this patch doesn't build on the old mingw32 compiler. I think this
is because this compiler is not C++11, and so its <stdint.h> doesn't
provide various macros for C++ unless __STDC_CONSTANT_MACROS,
__STDC_LIMIT_MACROS and __STDC_FORMAT_MACROS are defined before the
first inclusion of <stdint.h>.
libvixl's globals.h defines these constants, but this only works if
globals.h is first-include, so making osdep.h first-include then
results in stdint.h being included before globals.h has a chance
to set the defines.
What's the best way to deal with this? I can see a couple of options:
(1) as a special case, for this file include disasm-a64.h before
osdep.h
(2) as a special case, for this file manually define the __STDC_*
before including osdep.h
(3) make osdep.h itself define the __STDC_* constants so it works
with C++-before-C++11 as well as with C and with C++11
I think I prefer (3) (though it does mean we will have to tweak
osdep.h in future if a new vixl version should ever require any
further similar #defines.)
thanks
-- PMM
- [Qemu-devel] [PATCH 00/14] More #include cleanups, Peter Maydell, 2016/02/09
- [Qemu-devel] [PATCH 07/14] libdecnumber: Clean up includes, Peter Maydell, 2016/02/09
- [Qemu-devel] [PATCH 13/14] all: Clean up includes, Peter Maydell, 2016/02/09
- [Qemu-devel] [PATCH 12/14] scripts/tracetool: Include qemu/osdep.h in generated .c files, Peter Maydell, 2016/02/09
- [Qemu-devel] [PATCH 14/14] oslib-posix.c: Move workaround for OSX daemon() deprecation to osdep.h, Peter Maydell, 2016/02/09
- [Qemu-devel] [PATCH 04/14] hw/block/nand.c: Include osdep.h first, Peter Maydell, 2016/02/09
- [Qemu-devel] [PATCH 02/14] ui/cocoa.m: Include qemu/osdep.h, Peter Maydell, 2016/02/09