Module: Mesa
Branch: master
Commit: 3d3ae75c86f9ed47d86e471e4043827bb7731e92
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d3ae75c86f9ed47d86e471e4043827bb7731e92
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Sat Jan 11 05:16:06 2014 +0000
pci_ids: no not include loader.h
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 <emil.l.veli...@gmail.com>
Reviewed-by: Rob Clark <robdcl...@gmail.com>
Reviewed-by: Kristian Høgsberg <k...@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
---
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 2e88451..db9e07f 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 <stddef.h>
-#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 454e328..76b0871 100644
--- a/src/loader/SConscript
+++ b/src/loader/SConscript
@@ -6,7 +6,6 @@ if not env['drm']:
env = env.Clone()
env.Prepend(CPPPATH = [
- '.',
'#include'
])
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
