diff options
| author | gatecat <gatecat@ds0.me> | 2021-03-15 17:00:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 17:00:52 +0000 |
| commit | a8e35062c6a1a21838346dd7536bb2fcc7f820ed (patch) | |
| tree | c5466a8ed8f9108410561eb8d9d9ff5e2810d297 /generic | |
| parent | 3cf4a336665e07f8d210aa9d3336f3d5b0e82ea7 (diff) | |
| parent | fe4608386eb163c70a75ed84beb07516af378b36 (diff) | |
| download | nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.tar.gz nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.tar.bz2 nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.zip | |
Merge pull request #621 from litghost/fix_header_nightmare
Split nextpnr.h to allow for linear inclusion.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/arch.h | 15 | ||||
| -rw-r--r-- | generic/archdefs.h | 11 |
2 files changed, 20 insertions, 6 deletions
diff --git a/generic/arch.h b/generic/arch.h index cc8de484..1d37b2fd 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -17,9 +17,16 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef GENERIC_ARCH_H +#define GENERIC_ARCH_H + +#include <map> + +#include "arch_api.h" +#include "idstring.h" +#include "idstringlist.h" +#include "nextpnr_namespaces.h" +#include "nextpnr_types.h" NEXTPNR_NAMESPACE_BEGIN @@ -366,3 +373,5 @@ struct Arch : ArchAPI<ArchRanges> }; NEXTPNR_NAMESPACE_END + +#endif /* GENERIC_ARCH_H */ diff --git a/generic/archdefs.h b/generic/archdefs.h index a5108e9e..bdd97dde 100644 --- a/generic/archdefs.h +++ b/generic/archdefs.h @@ -17,9 +17,12 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef GENERIC_ARCHDEFS_H +#define GENERIC_ARCHDEFS_H + +#include <unordered_map> + +#include "idstringlist.h" NEXTPNR_NAMESPACE_BEGIN @@ -52,3 +55,5 @@ struct ArchCellInfo }; NEXTPNR_NAMESPACE_END + +#endif /* GENERIC_ARCHDEFS_H */ |