From 3d3ae75c86f9ed47d86e471e4043827bb7731e92 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 11 Jan 2014 05:16:06 +0000 Subject: [PATCH] pci_ids: no not include loader.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As per original approach by Rob, each user of the loader lib should include loader.h and the pci_id_driver_map.h header will be used exclusively by the loader. Add back the include guard __IS_LOADER and remove no longer needed include folder in the scons build. Signed-off-by: Emil Velikov Reviewed-by: Rob Clark Reviewed-by: Kristian Høgsberg Reviewed-by: Ian Romanick --- include/pci_ids/pci_id_driver_map.h | 5 ++++- src/loader/SConscript | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/pci_ids/pci_id_driver_map.h b/include/pci_ids/pci_id_driver_map.h index 2e88451e018..db9e07fbb28 100644 --- a/include/pci_ids/pci_id_driver_map.h +++ b/include/pci_ids/pci_id_driver_map.h @@ -2,12 +2,15 @@ #define _PCI_ID_DRIVER_MAP_H_ #include -#include "loader.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #endif +#ifndef __IS_LOADER +# error "Only include from loader.c" +#endif + static const int i915_chip_ids[] = { #define CHIPSET(chip, desc, name) chip, #include "pci_ids/i915_pci_ids.h" diff --git a/src/loader/SConscript b/src/loader/SConscript index 454e3284491..76b0871005b 100644 --- a/src/loader/SConscript +++ b/src/loader/SConscript @@ -6,7 +6,6 @@ if not env['drm']: env = env.Clone() env.Prepend(CPPPATH = [ - '.', '#include' ]) -- 2.30.2