From 19e44d79ec4f318033f3b94704047bdd27f7e1b7 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Thu, 4 Nov 2021 10:58:49 +0000 Subject: [PATCH] Revert "Reorder header file inclusion to avoid "byte" name collision." This reverts commit 4c4b09947fac0321f60bfc6c015c1b0b9782ce41. This didn't completely fix the problem, so try a different tack. --- vpi_modules.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vpi_modules.cc b/vpi_modules.cc index 8fba720b9..ea0ccde2f 100644 --- a/vpi_modules.cc +++ b/vpi_modules.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021 Martin Whitaker (icarus@martin-whitaker.me.uk) + * Copyright (c) 2019-2020 Martin Whitaker (icarus@martin-whitaker.me.uk) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -18,10 +18,10 @@ */ #include "config.h" -#include "vvp/ivl_dlfcn.h" #include "compiler.h" #include "vpi_user.h" #include "sv_vpi_user.h" +#include "vvp/ivl_dlfcn.h" /* The only VPI routines that can be legally called when the functions in the vlog_startup_routines[] array are executed are vpi_register_systf()