Move array implementation to shared directory

diff --git a/Makefile.am b/Makefile.am
index 7e063ff1b9d7860d0b0d8c31857757f858417fa9..7f65e315edca9e7c3d7c897e3a55d2228e969508 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,13 +45,13 @@ LIBKMOD_AGE=2
 noinst_LTLIBRARIES = libkmod/libkmod-util.la
 libkmod_libkmod_util_la_SOURCES = \
        shared/macro.h \
-       shared/missing.h\
+       shared/missing.h \
+       shared/array.c \
+       shared/array.h \
        shared/util.c \
        shared/util.h \
        libkmod/libkmod-hash.c \
        libkmod/libkmod-hash.h \
-       libkmod/libkmod-array.c \
-       libkmod/libkmod-array.h \
        libkmod/libkmod-util.c \
        libkmod/libkmod-util.h
 

diff --git a/libkmod/docs/Makefile.am b/libkmod/docs/Makefile.am
index 673c93b115690f4606b8d3a1d8dd518ee5dd3757..1fd6b900c8adc0d43b50403e4e7f772588bd899a 100644 (file)
--- a/libkmod/docs/Makefile.am
+++ b/libkmod/docs/Makefile.am
@@ -22,7 +22,6 @@ CFILE_GLOB = $(top_srcdir)/libkmod/libkmod.c $(top_srcdir)/libkmod/libkmod-modul
 
 IGNORE_HFILES = libkmod-internal.h \
                libkmod-util.h \
-               libkmod-array.h \
                libkmod-hash.h \
                libkmod-index.h
 

diff --git a/libkmod/libkmod-array.c b/shared/array.c
similarity index 99%
rename from libkmod/libkmod-array.c
rename to shared/array.c
index 1082debf983ef0045873be49d8504d0996e7a10d..b37e54e0fecc02ba65c0715f68d0a2679f224a85 100644 (file)
--- a/libkmod/libkmod-array.c
+++ b/shared/array.c
@@ -18,8 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <shared/array.h>
+
 #include "libkmod.h"
-#include "libkmod-array.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/libkmod/libkmod-array.h b/shared/array.h
similarity index 96%
rename from libkmod/libkmod-array.h
rename to shared/array.h
index dd2ba5525f2331a09403ea139b6efe6345d84889..b88482fe4f9097954d5eada3fff14407f33aba93 100644 (file)
--- a/libkmod/libkmod-array.h
+++ b/shared/array.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stddef.h>
+
 /*
  * Declaration of struct array is in header because we may want to embed the
  * structure into another, so we need to know its size

diff --git a/tools/depmod.c b/tools/depmod.c
index 274d020aae931b1b0b15f16bb0c9c5632174f855..e1e08f6713c394e389a4abceeb1e34fc8cb19814 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "libkmod.h"
-#include "libkmod-array.h"
 #include "libkmod-hash.h"
 #include "libkmod-util.h"
 
+#include <shared/array.h>
 #include <shared/macro.h>
 #include <shared/util.h>
 

diff --git a/tools/modprobe.c b/tools/modprobe.c
index eb3a36b7daf9efc90f2a3ca1826f9012916fb982..57992714e2a8ccd0c36d75deb9e8632bf0dfc5e7 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -32,7 +32,8 @@
 #include <limits.h>
 
 #include "libkmod.h"
-#include "libkmod-array.h"
+
+#include <shared/array.h>
 #include <shared/macro.h>
 
 #include "kmod.h"