From f357866d97995e30c0ad623880d28dc527ff6890 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 2 Jan 2015 12:38:27 -0200 Subject: [PATCH] Fix includes after change to build-sys Make the includes be libkmod/libkmod.h for code outside of library. This fixes the broken build after 1315123 ('build-sys: Don't add libkmod subdirectory to include path'). --- shared/array.c | 2 -- testsuite/test-blacklist.c | 2 +- testsuite/test-dependencies.c | 2 +- testsuite/test-init.c | 2 +- testsuite/test-loaded.c | 2 +- testsuite/test-new-module.c | 2 +- testsuite/test-testsuite.c | 2 +- tools/depmod.c | 2 +- tools/insmod.c | 2 +- tools/kmod.c | 2 +- tools/log.c | 2 +- tools/lsmod.c | 2 +- tools/modinfo.c | 2 +- tools/modprobe.c | 2 +- tools/rmmod.c | 2 +- 15 files changed, 14 insertions(+), 16 deletions(-) diff --git a/shared/array.c b/shared/array.c index f1f42c78..c2e2e148 100644 --- a/shared/array.c +++ b/shared/array.c @@ -24,8 +24,6 @@ #include -#include - /* basic pointer array growing in steps */ diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c index 1ec853fb..99a86ab1 100644 --- a/testsuite/test-blacklist.c +++ b/testsuite/test-blacklist.c @@ -23,7 +23,7 @@ #include #include -#include +#include /* good luck bulding a kmod_list outside of the library... makes this blacklist * function rather pointless */ diff --git a/testsuite/test-dependencies.c b/testsuite/test-dependencies.c index 36cebc5f..ac7a08fd 100644 --- a/testsuite/test-dependencies.c +++ b/testsuite/test-dependencies.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "testsuite.h" diff --git a/testsuite/test-init.c b/testsuite/test-init.c index 0c9094ca..df09ddac 100644 --- a/testsuite/test-init.c +++ b/testsuite/test-init.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "testsuite.h" diff --git a/testsuite/test-loaded.c b/testsuite/test-loaded.c index da164fdb..9d5814f2 100644 --- a/testsuite/test-loaded.c +++ b/testsuite/test-loaded.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "testsuite.h" diff --git a/testsuite/test-new-module.c b/testsuite/test-new-module.c index ae9716f0..360065cb 100644 --- a/testsuite/test-new-module.c +++ b/testsuite/test-new-module.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "testsuite.h" diff --git a/testsuite/test-testsuite.c b/testsuite/test-testsuite.c index 2d2c9633..58d312e1 100644 --- a/testsuite/test-testsuite.c +++ b/testsuite/test-testsuite.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "testsuite.h" diff --git a/tools/depmod.c b/tools/depmod.c index 9669a617..d25f76b1 100644 --- a/tools/depmod.c +++ b/tools/depmod.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include "kmod.h" diff --git a/tools/insmod.c b/tools/insmod.c index c3be4e44..e0c23139 100644 --- a/tools/insmod.c +++ b/tools/insmod.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kmod.h" diff --git a/tools/kmod.c b/tools/kmod.c index 42390275..abb1707b 100644 --- a/tools/kmod.c +++ b/tools/kmod.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kmod.h" diff --git a/tools/log.c b/tools/log.c index 4ae4aedf..e29a150d 100644 --- a/tools/log.c +++ b/tools/log.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include "kmod.h" diff --git a/tools/lsmod.c b/tools/lsmod.c index 28216396..e953c7e5 100644 --- a/tools/lsmod.c +++ b/tools/lsmod.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "kmod.h" diff --git a/tools/modinfo.c b/tools/modinfo.c index 74ec1834..36d8795d 100644 --- a/tools/modinfo.c +++ b/tools/modinfo.c @@ -29,7 +29,7 @@ #include -#include +#include #include "kmod.h" diff --git a/tools/modprobe.c b/tools/modprobe.c index b8262559..3af16c7a 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "kmod.h" diff --git a/tools/rmmod.c b/tools/rmmod.c index c6f1aeec..75fc7b5b 100644 --- a/tools/rmmod.c +++ b/tools/rmmod.c @@ -28,7 +28,7 @@ #include -#include +#include #include "kmod.h" -- 2.47.2