From fe4608386eb163c70a75ed84beb07516af378b36 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Fri, 12 Mar 2021 13:09:44 -0800 Subject: Split nextpnr.h to allow for linear inclusion. "nextpnr.h" is no longer the god header. Important improvements: - Functions in log.h can be used without including BaseCtx/Arch/Context. This means that log_X functions can be called without included "nextpnr.h" - NPNR_ASSERT can be used without including "nextpnr.h" by including "nextpnr_assertions.h". This allows NPNR_ASSERT to be used safely in any header file. - Types defined in "archdefs.h" are now available without including BaseCtx/Arch/Context. This means that utility classes that will be used inside of BaseCtx/Arch/Context can be defined safely in a self-contained header. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- fpga_interchange/luts.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'fpga_interchange/luts.h') diff --git a/fpga_interchange/luts.h b/fpga_interchange/luts.h index a5d3b1d0..333df36e 100644 --- a/fpga_interchange/luts.h +++ b/fpga_interchange/luts.h @@ -17,15 +17,17 @@ * */ -#ifndef NEXTPNR_H -#error Include "luts.h" via "nextpnr.h" only. -#endif - -#include "dynamic_bitarray.h" - #ifndef LUTS_H #define LUTS_H +#include +#include + +#include "idstring.h" +#include "nextpnr_namespaces.h" + +#include "dynamic_bitarray.h" + NEXTPNR_NAMESPACE_BEGIN struct CellInfo; -- cgit v1.2.3